From dceab0ab1260744b468c8caf9f559ef0a6c23a4a Mon Sep 17 00:00:00 2001
From: Steven Whitehouse <swhiteho@redhat.com>
Date: Fri, 2 Oct 2009 11:54:39 +0100
Subject: [PATCH] --- yaml --- r: 169182 b: refs/heads/master c:
 c65f7fb5342ecb8cb85e9b676327b3a43a5a4735 h: refs/heads/master v: v3

---
 [refs]                | 2 +-
 trunk/fs/gfs2/glops.c | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 9094b02bc8a8..cbe8129de0ad 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 796bd9524731850967d437b7f47a86acc776ea89
+refs/heads/master: c65f7fb5342ecb8cb85e9b676327b3a43a5a4735
diff --git a/trunk/fs/gfs2/glops.c b/trunk/fs/gfs2/glops.c
index 6985eef06c39..78554acc0605 100644
--- a/trunk/fs/gfs2/glops.c
+++ b/trunk/fs/gfs2/glops.c
@@ -13,6 +13,7 @@
 #include <linux/buffer_head.h>
 #include <linux/gfs2_ondisk.h>
 #include <linux/bio.h>
+#include <linux/posix_acl.h>
 
 #include "gfs2.h"
 #include "incore.h"
@@ -184,8 +185,10 @@ static void inode_go_inval(struct gfs2_glock *gl, int flags)
 	if (flags & DIO_METADATA) {
 		struct address_space *mapping = gl->gl_aspace->i_mapping;
 		truncate_inode_pages(mapping, 0);
-		if (ip)
+		if (ip) {
 			set_bit(GIF_INVALID, &ip->i_flags);
+			forget_all_cached_acls(&ip->i_inode);
+		}
 	}
 
 	if (ip == GFS2_I(gl->gl_sbd->sd_rindex))