From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail.kernel.org ([198.145.29.99]:44908 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726436AbeLQMVl (ORCPT ); Mon, 17 Dec 2018 07:21:41 -0500 Message-ID: <1fe6e58f3f62718134f691b2cc149fbf2aa6f28d.camel@kernel.org> Subject: Re: [PATCH] locks: Use inode_is_open_for_write From: Jeff Layton To: Nikolay Borisov Cc: bfields@fieldses.org, viro@zeniv.linux.org.uk, linux-fsdevel@vger.kernel.org Date: Mon, 17 Dec 2018 07:21:39 -0500 In-Reply-To: <20181211082925.21203-1-nborisov@suse.com> References: <20181211082925.21203-1-nborisov@suse.com> Content-Type: text/plain; charset="UTF-8" Mime-Version: 1.0 Content-Transfer-Encoding: 7bit Sender: linux-fsdevel-owner@vger.kernel.org List-ID: On Tue, 2018-12-11 at 10:29 +0200, Nikolay Borisov wrote: > Use the aptly named function rather than open coding it. No functional > changes. > > Signed-off-by: Nikolay Borisov > --- > fs/locks.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/fs/locks.c b/fs/locks.c > index 2ecb4db8c840..16ea7d89a67d 100644 > --- a/fs/locks.c > +++ b/fs/locks.c > @@ -1646,7 +1646,7 @@ check_conflicting_open(const struct dentry *dentry, const long arg, int flags) > if (flags & FL_LAYOUT) > return 0; > > - if ((arg == F_RDLCK) && (atomic_read(&inode->i_writecount) > 0)) > + if ((arg == F_RDLCK) && inode_is_open_for_write(inode)) > return -EAGAIN; > > if ((arg == F_WRLCK) && ((d_count(dentry) > 1) || Thanks, merged into locks-next. This should make v4.21. -- Jeff Layton