Kernel/linux-next
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git synced 2025-01-01 10:42:11 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

locks: factor out generic/filesystem switch from setlock code

Browse Source 
Factor out the code that switches between generic and filesystem-specific lock
methods; eventually we want to call this from lock managers (lockd and nfsd)
too; currently they only call the generic methods.

This patch does that for all the setlk code.

Signed-off-by: Marc Eshel <eshel@almaden.ibm.com>
Signed-off-by: "J. Bruce Fields" <bfields@citi.umich.edu>
This commit is contained in:
Marc Eshel 2007-01-18 15:08:55 -05:00 committed by J. Bruce Fields
parent 3ee17abd14
commit 7723ec9777
2 changed files with 37 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
fs/locks.c
View File

@ -1698,6 +1698,21 @@ int fcntl_getlk(struct file *filp, struct flock __user *l)
return error; return error;
} }
/**
* vfs_lock_file - file byte range lock
* @filp: The file to apply the lock to
* @cmd: type of locking operation (F_SETLK, F_GETLK, etc.)
* @fl: The lock to be applied
*/
int vfs_lock_file(struct file *filp, unsigned int cmd, struct file_lock *fl)
{
if (filp->f_op && filp->f_op->lock)
return filp->f_op->lock(filp, cmd, fl);
else
return posix_lock_file(filp, fl);
}
EXPORT_SYMBOL_GPL(vfs_lock_file);
/* Apply the lock described by l to an open file descriptor. /* Apply the lock described by l to an open file descriptor.
* This implements both the F_SETLK and F_SETLKW commands of fcntl(). * This implements both the F_SETLK and F_SETLKW commands of fcntl().
*/ */
@ -1760,21 +1775,17 @@ int fcntl_setlk(unsigned int fd, struct file *filp, unsigned int cmd,
if (error) if (error)
goto out; goto out;
if (filp->f_op && filp->f_op->lock != NULL) for (;;) {
error = filp->f_op->lock(filp, cmd, file_lock); error = vfs_lock_file(filp, cmd, file_lock);
else { if (error != -EAGAIN || cmd == F_SETLK)
for (;;) {
error = posix_lock_file(filp, file_lock);
if (error != -EAGAIN || cmd == F_SETLK)
break;
error = wait_event_interruptible(file_lock->fl_wait,
!file_lock->fl_next);
if (!error)
continue;
locks_delete_block(file_lock);
break; break;
} error = wait_event_interruptible(file_lock->fl_wait,
!file_lock->fl_next);
if (!error)
continue;
locks_delete_block(file_lock);
break;
} }
/* /*
@ -1890,21 +1901,17 @@ int fcntl_setlk64(unsigned int fd, struct file *filp, unsigned int cmd,
if (error) if (error)
goto out; goto out;
if (filp->f_op && filp->f_op->lock != NULL) for (;;) {
error = filp->f_op->lock(filp, cmd, file_lock); error = vfs_lock_file(filp, cmd, file_lock);
else { if (error != -EAGAIN || cmd == F_SETLK64)
for (;;) {
error = posix_lock_file(filp, file_lock);
if (error != -EAGAIN || cmd == F_SETLK64)
break;
error = wait_event_interruptible(file_lock->fl_wait,
!file_lock->fl_next);
if (!error)
continue;
locks_delete_block(file_lock);
break; break;
} error = wait_event_interruptible(file_lock->fl_wait,
!file_lock->fl_next);
if (!error)
continue;
locks_delete_block(file_lock);
break;
} }
/* /*
@ -1949,10 +1956,7 @@ void locks_remove_posix(struct file *filp, fl_owner_t owner)
lock.fl_ops = NULL; lock.fl_ops = NULL;
lock.fl_lmops = NULL; lock.fl_lmops = NULL;
if (filp->f_op && filp->f_op->lock != NULL) vfs_lock_file(filp, F_SETLK, &lock);
filp->f_op->lock(filp, F_SETLK, &lock);
else
posix_lock_file(filp, &lock);
if (lock.fl_ops && lock.fl_ops->fl_release_private) if (lock.fl_ops && lock.fl_ops->fl_release_private)
lock.fl_ops->fl_release_private(&lock); lock.fl_ops->fl_release_private(&lock);

1
include/linux/fs.h
View File

@ -857,6 +857,7 @@ extern int posix_lock_file(struct file *, struct file_lock *);
extern int posix_lock_file_wait(struct file *, struct file_lock *); extern int posix_lock_file_wait(struct file *, struct file_lock *);
extern int posix_unblock_lock(struct file *, struct file_lock *); extern int posix_unblock_lock(struct file *, struct file_lock *);
extern int vfs_test_lock(struct file *, struct file_lock *); extern int vfs_test_lock(struct file *, struct file_lock *);
extern int vfs_lock_file(struct file *, unsigned int, struct file_lock *);
extern int flock_lock_file_wait(struct file *filp, struct file_lock *fl); extern int flock_lock_file_wait(struct file *filp, struct file_lock *fl);
extern int __break_lease(struct inode *inode, unsigned int flags); extern int __break_lease(struct inode *inode, unsigned int flags);
extern void lease_get_mtime(struct inode *, struct timespec *time); extern void lease_get_mtime(struct inode *, struct timespec *time);