Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

fs/inode.c: inode_set_flags(): replace opencoded set_mask_bits()

It seems that commits 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)

Link: http://lkml.kernel.org/r/1548275584-18096-3-git-send-email-vgupta@synopsys.com
Signed-off-by: Vineet Gupta <vgupta@synopsys.com>
Reviewed-by: Anthony Yznaga <anthony.yznaga@oracle.com>
Cc: Alexander Viro <viro@zeniv.linux.org.uk>
Cc: Theodore Ts'o <tytso@mit.edu>
Cc: Peter Zijlstra (Intel) <peterz@infradead.org>
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Jani Nikula <jani.nikula@intel.com>
Cc: Miklos Szeredi <mszeredi@redhat.com>
Cc: Oleg Nesterov <oleg@redhat.com>
Cc: Will Deacon <will.deacon@arm.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

authored by

Vineet Gupta and committed by
Linus Torvalds
a905737f f402cf03

+1 -7
+1 -7
fs/inode.c
··· 2093 2093 void inode_set_flags(struct inode *inode, unsigned int flags, 2094 2094 unsigned int mask) 2095 2095 { 2096 - unsigned int old_flags, new_flags; 2097 - 2098 2096 WARN_ON_ONCE(flags & ~mask); 2099 - do { 2100 - old_flags = READ_ONCE(inode->i_flags); 2101 - new_flags = (old_flags & ~mask) | flags; 2102 - } while (unlikely(cmpxchg(&inode->i_flags, old_flags, 2103 - new_flags) != old_flags)); 2097 + set_mask_bits(&inode->i_flags, mask, flags); 2104 2098 } 2105 2099 EXPORT_SYMBOL(inode_set_flags); 2106 2100