summaryrefslogtreecommitdiffstats
path: root/fs/gfs2
diff options
context:
space:
mode:
authorBenjamin Marzinski <bmarzins@redhat.com>2015-05-05 12:25:48 -0500
committerBob Peterson <rpeterso@redhat.com>2015-05-05 12:25:48 -0500
commit01e64ee40ad741037352d1d6202eaa432f833eb4 (patch)
treeabc5b4b8440ee6e1c700e53677035f51584211cb /fs/gfs2
parenta63b7bbc2175901d79fa36ba734499655c077f0d (diff)
downloadlinux-01e64ee40ad741037352d1d6202eaa432f833eb4.tar.gz
linux-01e64ee40ad741037352d1d6202eaa432f833eb4.tar.bz2
linux-01e64ee40ad741037352d1d6202eaa432f833eb4.zip
GFS2: make sure S_NOSEC flag isn't overwritten
At the end of gfs2_set_inode_flags inode->i_flags is set to flags, so we should be modifying flags instead of inode->i_flags, so it isn't overwritten. Signed-off-by: Benjamin Marzinski <bmarzins redhat com> Signed-off-by: Bob Peterson <rpeterso@redhat.com>
Diffstat (limited to 'fs/gfs2')
-rw-r--r--fs/gfs2/file.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/gfs2/file.c b/fs/gfs2/file.c
index 8ec43ab5babf..c706c6df4898 100644
--- a/fs/gfs2/file.c
+++ b/fs/gfs2/file.c
@@ -180,7 +180,7 @@ void gfs2_set_inode_flags(struct inode *inode)
flags &= ~(S_SYNC|S_APPEND|S_IMMUTABLE|S_NOATIME|S_DIRSYNC|S_NOSEC);
if ((ip->i_eattr == 0) && !is_sxid(inode->i_mode))
- inode->i_flags |= S_NOSEC;
+ flags |= S_NOSEC;
if (ip->i_diskflags & GFS2_DIF_IMMUTABLE)
flags |= S_IMMUTABLE;
if (ip->i_diskflags & GFS2_DIF_APPENDONLY)