From mboxrd@z Thu Jan 1 00:00:00 1970 From: "J. Bruce Fields" Subject: Re: [PATCH v7 08/17] locks: rename locks_remove_flock to locks_remove_file Date: Sun, 23 Mar 2014 18:58:45 -0400 Message-ID: <20140323225844.GA13927@fieldses.org> References: <1395261961-10855-1-git-send-email-jlayton@redhat.com> <1395261961-10855-9-git-send-email-jlayton@redhat.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Cc: viro@ZenIV.linux.org.uk, linux-fsdevel@vger.kernel.org To: Jeff Layton Return-path: Received: from fieldses.org ([174.143.236.118]:39188 "EHLO fieldses.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750971AbaCWW6r (ORCPT ); Sun, 23 Mar 2014 18:58:47 -0400 Content-Disposition: inline In-Reply-To: <1395261961-10855-9-git-send-email-jlayton@redhat.com> Sender: linux-fsdevel-owner@vger.kernel.org List-ID: On Wed, Mar 19, 2014 at 04:45:52PM -0400, Jeff Layton wrote: > This function currently removes leases in addition to flock locks and in > a later patch we'll have it deal with file-private locks too. Rename it > to locks_remove_file to indicate that it removes locks that are > associated with a particular struct file, and not just flock locks. Ack.--b. > > Signed-off-by: Jeff Layton > --- > fs/file_table.c | 2 +- > fs/locks.c | 2 +- > include/linux/fs.h | 4 ++-- > 3 files changed, 4 insertions(+), 4 deletions(-) > > diff --git a/fs/file_table.c b/fs/file_table.c > index 5fff9030be34..468543c1973d 100644 > --- a/fs/file_table.c > +++ b/fs/file_table.c > @@ -234,7 +234,7 @@ static void __fput(struct file *file) > * in the file cleanup chain. > */ > eventpoll_release(file); > - locks_remove_flock(file); > + locks_remove_file(file); > > if (unlikely(file->f_flags & FASYNC)) { > if (file->f_op->fasync) > diff --git a/fs/locks.c b/fs/locks.c > index 4cd25781b0a4..4d4e790150e0 100644 > --- a/fs/locks.c > +++ b/fs/locks.c > @@ -2196,7 +2196,7 @@ EXPORT_SYMBOL(locks_remove_posix); > /* > * This function is called on the last close of an open file. > */ > -void locks_remove_flock(struct file *filp) > +void locks_remove_file(struct file *filp) > { > struct inode * inode = file_inode(filp); > struct file_lock *fl; > diff --git a/include/linux/fs.h b/include/linux/fs.h > index df8474408331..7527d96913d3 100644 > --- a/include/linux/fs.h > +++ b/include/linux/fs.h > @@ -1012,7 +1012,7 @@ extern struct file_lock * locks_alloc_lock(void); > extern void locks_copy_lock(struct file_lock *, struct file_lock *); > extern void __locks_copy_lock(struct file_lock *, const struct file_lock *); > extern void locks_remove_posix(struct file *, fl_owner_t); > -extern void locks_remove_flock(struct file *); > +extern void locks_remove_file(struct file *); > extern void locks_release_private(struct file_lock *); > extern void posix_test_lock(struct file *, struct file_lock *); > extern int posix_lock_file(struct file *, struct file_lock *, struct file_lock *); > @@ -1083,7 +1083,7 @@ static inline void locks_remove_posix(struct file *filp, fl_owner_t owner) > return; > } > > -static inline void locks_remove_flock(struct file *filp) > +static inline void locks_remove_file(struct file *filp) > { > return; > } > -- > 1.8.5.3 >