From mboxrd@z Thu Jan 1 00:00:00 1970 From: Sukadev Bhattiprolu Subject: [PATCH 2/5][v5][cr]: Define flock_set() Date: Thu, 28 Oct 2010 23:16:38 -0700 Message-ID: <1288333001-28838-3-git-send-email-sukadev@linux.vnet.ibm.com> References: <1288333001-28838-1-git-send-email-sukadev@linux.vnet.ibm.com> Cc: Serge Hallyn , Matt Helsley , Dan Smith , Matthew Wilcox , Jamie Lokier , Steven Whitehouse , , Containers To: Oren Laadan Return-path: Received: from e9.ny.us.ibm.com ([32.97.182.139]:42978 "EHLO e9.ny.us.ibm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753481Ab0J2GJK (ORCPT ); Fri, 29 Oct 2010 02:09:10 -0400 Received: from d01relay07.pok.ibm.com (d01relay07.pok.ibm.com [9.56.227.147]) by e9.ny.us.ibm.com (8.14.4/8.13.1) with ESMTP id o9T5mER4001264 for ; Fri, 29 Oct 2010 01:48:14 -0400 Received: from d01av01.pok.ibm.com (d01av01.pok.ibm.com [9.56.224.215]) by d01relay07.pok.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id o9T6929K2367502 for ; Fri, 29 Oct 2010 02:09:02 -0400 Received: from d01av01.pok.ibm.com (loopback [127.0.0.1]) by d01av01.pok.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id o9T691IF020447 for ; Fri, 29 Oct 2010 02:09:02 -0400 In-Reply-To: <1288333001-28838-1-git-send-email-sukadev@linux.vnet.ibm.com> Sender: linux-fsdevel-owner@vger.kernel.org List-ID: Extract core functionality of fcntl_setlk() into a separate function, flock_set(). flock_set() can be also used when restarting a checkpointed application and restoring its file-locks. Signed-off-by: Sukadev Bhattiprolu --- fs/locks.c | 44 +++++++++++++++++++++++++++----------------- include/linux/fs.h | 1 + 2 files changed, 28 insertions(+), 17 deletions(-) diff --git a/fs/locks.c b/fs/locks.c index da53795..6c6ced4 100644 --- a/fs/locks.c +++ b/fs/locks.c @@ -1758,14 +1758,10 @@ static int do_lock_file_wait(struct file *filp, unsigned int cmd, return error; } -/* Apply the lock described by l to an open file descriptor. - * This implements both the F_SETLK and F_SETLKW commands of fcntl(). - */ -int fcntl_setlk(unsigned int fd, struct file *filp, unsigned int cmd, - struct flock __user *l) +int flock_set(unsigned int fd, struct file *filp, unsigned int cmd, + struct flock *flock) { struct file_lock *file_lock = locks_alloc_lock(); - struct flock flock; struct inode *inode; struct file *f; int error; @@ -1773,13 +1769,6 @@ int fcntl_setlk(unsigned int fd, struct file *filp, unsigned int cmd, if (file_lock == NULL) return -ENOLCK; - /* - * This might block, so we do it before checking the inode. - */ - error = -EFAULT; - if (copy_from_user(&flock, l, sizeof(flock))) - goto out; - inode = filp->f_path.dentry->d_inode; /* Don't allow mandatory locks on files that may be memory mapped @@ -1791,7 +1780,7 @@ int fcntl_setlk(unsigned int fd, struct file *filp, unsigned int cmd, } again: - error = flock_to_posix_lock(filp, file_lock, &flock); + error = flock_to_posix_lock(filp, file_lock, flock); if (error) goto out; if (cmd == F_SETLKW) { @@ -1799,7 +1788,7 @@ again: } error = -EBADF; - switch (flock.l_type) { + switch (flock->l_type) { case F_RDLCK: if (!(filp->f_mode & FMODE_READ)) goto out; @@ -1829,8 +1818,8 @@ again: spin_lock(¤t->files->file_lock); f = fcheck(fd); spin_unlock(¤t->files->file_lock); - if (!error && f != filp && flock.l_type != F_UNLCK) { - flock.l_type = F_UNLCK; + if (!error && f != filp && flock->l_type != F_UNLCK) { + flock->l_type = F_UNLCK; goto again; } @@ -1839,6 +1828,27 @@ out: return error; } +/* Apply the lock described by l to an open file descriptor. + * This implements both the F_SETLK and F_SETLKW commands of fcntl(). + */ +int fcntl_setlk(unsigned int fd, struct file *filp, unsigned int cmd, + struct flock __user *l) +{ + int error; + struct flock flock; + + /* + * This might block, so we do it before checking the inode + * in flock_set(). + */ + error = -EFAULT; + if (copy_from_user(&flock, l, sizeof(flock))) + return error; + + return flock_set(fd, filp, cmd, &flock); +} + + #if BITS_PER_LONG == 32 /* Report the first existing lock that would conflict with l. * This implements the F_GETLK command of fcntl(). diff --git a/include/linux/fs.h b/include/linux/fs.h index 909a535..5e9ea17 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h @@ -1112,6 +1112,7 @@ extern void send_sigio(struct fown_struct *fown, int fd, int band); extern int fcntl_getlk(struct file *, struct flock __user *); extern int fcntl_setlk(unsigned int, struct file *, unsigned int, struct flock __user *); +extern int flock_set(unsigned int, struct file *, unsigned int, struct flock *); #if BITS_PER_LONG == 32 extern int fcntl_getlk64(struct file *, struct flock64 __user *); -- 1.6.0.4