From: Benjamin Marzinski <bmarzins@redhat.com>
Date: Tue, 5 May 2015 17:25:48 +0000 (-0500)
Subject: GFS2: make sure S_NOSEC flag isn't overwritten
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=01e64ee40ad741037352d1d6202eaa432f833eb4;p=deliverable%2Flinux.git

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>
---

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)