| Message ID | 1547166387-19785-3-git-send-email-vgupta@synopsys.com |
|---|---|
| State | New |
| Headers | show |
| Series | Replace opencoded set_mask_bits | expand |
On 1/10/19 4:26 PM, Vineet Gupta wrote: > It seems that 5f16f3225b0624 and 00a1a053ebe5, both with same commitlog > ("ext4: atomically set inode->i_flags in ext4_set_inode_flags()") > introduced the set_mask_bits API, but somehow missed not using it in > ext4 in the end > > Also, set_mask_bits is used in fs quite a bit and we can possibly come up > with a generic llsc based implementation (w/o the cmpxchg loop) > > Cc: Alexander Viro <viro@zeniv.linux.org.uk> > Cc: Theodore Ts'o <tytso@mit.edu> > Cc: Peter Zijlstra (Intel) <peterz@infradead.org> > Cc: linux-fsdevel@vger.kernel.org > Cc: linux-kernel@vger.kernel.org > Signed-off-by: Vineet Gupta <vgupta@synopsys.com> > Reviewed-by: Anthony Yznaga <anthony.yznaga@oracle.com>
diff --git a/fs/inode.c b/fs/inode.c index 0cd47fe0dbe5..799b0c4beda8 100644 --- a/fs/inode.c +++ b/fs/inode.c @@ -2096,14 +2096,8 @@ EXPORT_SYMBOL(inode_dio_wait); void inode_set_flags(struct inode *inode, unsigned int flags, unsigned int mask) { - unsigned int old_flags, new_flags; - WARN_ON_ONCE(flags & ~mask); - do { - old_flags = READ_ONCE(inode->i_flags); - new_flags = (old_flags & ~mask) | flags; - } while (unlikely(cmpxchg(&inode->i_flags, old_flags, - new_flags) != old_flags)); + set_mask_bits(&inode->i_flags, mask, flags); } EXPORT_SYMBOL(inode_set_flags);
It seems that 5f16f3225b0624 and 00a1a053ebe5, both with same commitlog ("ext4: atomically set inode->i_flags in ext4_set_inode_flags()") introduced the set_mask_bits API, but somehow missed not using it in ext4 in the end Also, set_mask_bits is used in fs quite a bit and we can possibly come up with a generic llsc based implementation (w/o the cmpxchg loop) Cc: Alexander Viro <viro@zeniv.linux.org.uk> Cc: Theodore Ts'o <tytso@mit.edu> Cc: Peter Zijlstra (Intel) <peterz@infradead.org> Cc: linux-fsdevel@vger.kernel.org Cc: linux-kernel@vger.kernel.org Signed-off-by: Vineet Gupta <vgupta@synopsys.com> --- fs/inode.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-)