From 7c70ed0f4bcd0c0b7c84b44d05e8b51f6f56e2c4 Mon Sep 17 00:00:00 2001
From: Steven Whitehouse <swhiteho@redhat.com>
Date: Fri, 4 May 2012 14:33:06 +0100
Subject: [PATCH] --- yaml --- r: 302702 b: refs/heads/master c:
 f9425ad4e5c8f8f9f6297d0358dc44ca058ffe47 h: refs/heads/master v: v3

---
 [refs]              |  2 +-
 trunk/fs/gfs2/acl.c | 12 +++---------
 2 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/[refs] b/[refs]
index a7b7103ae645..f3bca3ad7783 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c0752aa7e4d48cc19e167ccb0092bea8e5b6ca3a
+refs/heads/master: f9425ad4e5c8f8f9f6297d0358dc44ca058ffe47
diff --git a/trunk/fs/gfs2/acl.c b/trunk/fs/gfs2/acl.c
index 230eb0f005b6..bd4a5892c93c 100644
--- a/trunk/fs/gfs2/acl.c
+++ b/trunk/fs/gfs2/acl.c
@@ -73,12 +73,8 @@ static int gfs2_set_mode(struct inode *inode, umode_t mode)
 	int error = 0;
 
 	if (mode != inode->i_mode) {
-		struct iattr iattr;
-
-		iattr.ia_valid = ATTR_MODE;
-		iattr.ia_mode = mode;
-
-		error = gfs2_setattr_simple(inode, &iattr);
+		inode->i_mode = mode;
+		mark_inode_dirty(inode);
 	}
 
 	return error;
@@ -126,9 +122,7 @@ int gfs2_acl_create(struct gfs2_inode *dip, struct inode *inode)
 		return PTR_ERR(acl);
 	if (!acl) {
 		mode &= ~current_umask();
-		if (mode != inode->i_mode)
-			error = gfs2_set_mode(inode, mode);
-		return error;
+		return gfs2_set_mode(inode, mode);
 	}
 
 	if (S_ISDIR(inode->i_mode)) {