From mboxrd@z Thu Jan 1 00:00:00 1970 From: Benjamin Coddington Subject: [PATCH 0/3] Minor cleanup for locks API Date: Thu, 22 Oct 2015 11:35:53 -0400 Message-ID: Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Cc: Latchesar Ionkov , linux-fsdevel@vger.kernel.org, Trond Myklebust , devel@driverdev.osuosl.org, Yan Zheng , cluster-devel@redhat.com, Sage Weil , Miklos Szeredi , Christoph Hellwig , fuse-devel@lists.sourceforge.net, Christine Caulfield , v9fs-developer@lists.sourceforge.net, Ilya Dryomov , linux-cifs@vger.kernel.org, Eric Van Hensbergen , Mark Fasheh , Oleg Drokin , Julia Lawall , David Teigland , Joel Becker , ceph-devel@vger.kernel.org, Abdul Hussain , Steven Whitehouse , linux-nfs@vger.kernel.org, Andreas Dilger , Greg K To: Jeff Layton , "J. Bruce Fields" , Alexander Viro Return-path: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: driverdev-devel-bounces@linuxdriverproject.org Sender: "devel" List-Id: linux-fsdevel.vger.kernel.org NFS has recently been moving things around to cope with the situation where a struct file may not be available during an unlock. That work has presented an opportunity to do a minor cleanup on the locks API. Users of posix_lock_file_wait() (for FL_POSIX style locks) and flock_lock_file_wait() (for FL_FLOCK style locks) can instead call locks_lock_file_wait() for both lock types. Because the passed-in file_lock specifies its own type, the correct function can be selected on behalf of the user. This work allows further cleanup within NFS and lockd which will be submitted separately. Benjamin Coddington (3): locks: introduce locks_lock_inode_wait() Move locks API users to locks_lock_inode_wait() locks: cleanup posix_lock_inode_wait and flock_lock_inode_wait drivers/staging/lustre/lustre/llite/file.c | 8 +----- fs/9p/vfs_file.c | 4 +- fs/ceph/locks.c | 4 +- fs/cifs/file.c | 2 +- fs/dlm/plock.c | 4 +- fs/fuse/file.c | 2 +- fs/gfs2/file.c | 8 +++--- fs/lockd/clntproc.c | 13 +---------- fs/locks.c | 31 +++++++++++++++++++++++---- fs/nfs/file.c | 13 +---------- fs/nfs/nfs4proc.c | 13 +---------- fs/ocfs2/locks.c | 8 +++--- include/linux/fs.h | 21 +++--------------- 13 files changed, 51 insertions(+), 80 deletions(-)