CFT: new posix file locking code
Subsystems (4)
This is a fairly extensive rewrite of the POSIX file locking code, so I'd appreciate some eyes (and, better, testers!). If you were paying attention earlier, this basically corresponds to flock-A3, -B0 and half of -B1 (which are now in a flock-2.5.15 directory), plus some bugfixes.
The posix_lock_file function was 176 lines. I split it into 75 lines in __posix_lock_file and 56 in posix_juggle_locks. I realise that functions are ideally a mere 20-50 lines long, but this significantly improves the nosebleed quotient.
We have a new flag -- FL_SLEEP. This indicates that we're interested in a sleeping lock rather than returning -EAGAIN to userspace. NFS is never interested in sleeping so never specifies this flag. Callers which do use the FL_SLEEP flag need to use a wait_event_interruptible loop.
fs/lockd/svclock.c +4 -4
@@ -242,7 +242,7 @@if (unlock && block->b_granted) {dprintk ("lockd: deleting granted lock\n" ); fl->fl_type =F_UNLCK ; -posix_lock_file (&block->b_file->f_file, fl,0 ); +posix_lock_file (&block->b_file->f_file, fl); block->b_granted =0 ; }else {dprintk ("lockd: unblocking blocked lock\n" );
@@ -324,7 +324,7 @@ again:if (!(conflock =posix_test_lock (&file->f_file, &lock->fl))) { - error =posix_lock_file (&file->f_file, &lock->fl,0 ); + error =posix_lock_file (&file->f_file, &lock->fl);if (block)nlmsvc_delete_block (block,0 );
@@ -428,7 +428,7 @@nlmsvc_cancel_blocked (file, lock); lock->fl.fl_type =F_UNLCK ; - error =posix_lock_file (&file->f_file, &lock->fl,0 ); + error =posix_lock_file (&file->f_file, &lock->fl);return (error <0 )? nlm_lck_denied_nolocks : nlm_granted; }
@@ -533,7 +533,7 @@* following yields an error, this is most probably due to low * memory. Retry the lock in a few seconds. */ -if ((error =posix_lock_file (&file->f_file, &lock->fl,0 )) <0 ) { +if ((error =posix_lock_file (&file->f_file, &lock->fl)) <0 ) {printk (KERN_WARNING "lockd: unexpected error %d in %s!\n" , -error, __FUNCTION__);nlmsvc_insert_block (block,10 *HZ );
fs/lockd/svcsubs.c +1 -1
@@ -176,7 +176,7 @@ lock.fl_type =F_UNLCK ; lock.fl_start =0 ; lock.fl_end =OFFSET_MAX ; -if (posix_lock_file (&file->f_file, &lock,0 ) <0 ) { +if (posix_lock_file (&file->f_file, &lock) <0 ) {printk ("lockd: unlock failure in %s:%d\n" , __FILE__, __LINE__);return 1 ;
fs/locks.c +198 -171
488 lines not on this page · raw message
include/linux/fs.h +3 -3
@@ -519,10 +519,10 @@#define FL_POSIX 1#define FL_FLOCK 2 -#define FL_BROKEN 4/* broken flock() emulation */ -#define FL_ACCESS 8/* for processes suspended by mandatory locking */ +#define FL_ACCESS 8/* not trying to lock, just looking */ #define FL_LOCKD 16/* lock held by rpc.lockd */ #define FL_LEASE 32/* lease held on this file */ +#define FL_SLEEP 128/* A blocking lock */ /* * The POSIX file lock owner is determined by
@@ -583,7 +583,7 @@extern void locks_remove_posix (struct file *,fl_owner_t );extern void locks_remove_flock (struct file *);extern struct file_lock *posix_test_lock (struct file *,struct file_lock *); -extern int posix_lock_file (struct file *,struct file_lock *,unsigned int ); +extern int posix_lock_file (struct file *,struct file_lock *);extern void posix_block_lock (struct file_lock *,struct file_lock *);extern void posix_unblock_lock (struct file_lock *);extern int posix_locks_deadlock (struct file_lock *,struct file_lock *);
Signature · 1 line
Revolutions do not require corporate support.