diff options
| author | Theodore Ts'o <tytso@mit.edu> | 2014-03-24 14:43:12 -0400 |
|---|---|---|
| committer | Jiri Slaby <jslaby@suse.cz> | 2014-12-03 11:58:43 +0100 |
| commit | ec81c28104fd2198f076203be3d1bae5546e863f (patch) | |
| tree | a0c2a33ae915b3dcc57e55b501b2a8f7b7b9906c /fs/ext4 | |
| parent | 692f067fb661c39cc800ae7407ab655173ca2de2 (diff) | |
ext4: atomically set inode->i_flags in ext4_set_inode_flags()
commit 5f16f3225b06242a9ee876f07c1c9b6ed36a22b6 upstream.
Use cmpxchg() to atomically set i_flags instead of clearing out the
S_IMMUTABLE, S_APPEND, etc. flags and then setting them from the
EXT4_IMMUTABLE_FL, EXT4_APPEND_FL flags, since this opens up a race
where an immutable file has the immutable flag cleared for a brief
window of time.
js: there is no change for ext4. This patch defines merely
inode_set_flags for jffs in the next patch. I wonder why do we
have both inode_set_flags and set_mask_bits? Looks like an
improperly resolved merge conflict.
Reported-by: John Sullivan <jsrhbz@kanargh.force9.co.uk>
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
Cc: stable@kernel.org
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
Diffstat (limited to 'fs/ext4')
| -rw-r--r-- | fs/ext4/inode.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c index a58a796bb92b..ba68d211d748 100644 --- a/fs/ext4/inode.c +++ b/fs/ext4/inode.c @@ -3970,8 +3970,8 @@ void ext4_set_inode_flags(struct inode *inode) new_fl |= S_NOATIME; if (flags & EXT4_DIRSYNC_FL) new_fl |= S_DIRSYNC; - set_mask_bits(&inode->i_flags, - S_SYNC|S_APPEND|S_IMMUTABLE|S_NOATIME|S_DIRSYNC, new_fl); + inode_set_flags(inode, new_fl, + S_SYNC|S_APPEND|S_IMMUTABLE|S_NOATIME|S_DIRSYNC); } /* Propagate flags from i_flags to EXT4_I(inode)->i_flags */ |