mirror of
https://github.com/torvalds/linux.git
synced 2024-12-27 05:11:48 +00:00
fs/inode.c: inode_set_flags(): replace opencoded set_mask_bits()
It seems that commits5f16f3225b
and00a1a053eb
, 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>
This commit is contained in:
parent
f402cf03fc
commit
a905737fdd
@ -2093,14 +2093,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);
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user