From eca6a8e45eaf3a3ab2c87a492ad4511813554b94 Mon Sep 17 00:00:00 2001
From: Steven Whitehouse <swhiteho@redhat.com>
Date: Fri, 21 May 2010 16:12:27 +0100
Subject: [PATCH] --- yaml --- r: 198366 b: refs/heads/master c:
 f72f2d2e2f3238e4dedf4afb5f9945b3227dd87e h: refs/heads/master v: v3

---
 [refs]              | 2 +-
 trunk/fs/gfs2/acl.c | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index e6cac472f244..55165b4fe7e2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ed4878e8a4f550fd357ce5144cfd412015f6a111
+refs/heads/master: f72f2d2e2f3238e4dedf4afb5f9945b3227dd87e
diff --git a/trunk/fs/gfs2/acl.c b/trunk/fs/gfs2/acl.c
index 87ee309d4c24..ca991d776592 100644
--- a/trunk/fs/gfs2/acl.c
+++ b/trunk/fs/gfs2/acl.c
@@ -236,10 +236,14 @@ static int gfs2_xattr_system_get(struct dentry *dentry, const char *name,
 				 void *buffer, size_t size, int xtype)
 {
 	struct inode *inode = dentry->d_inode;
+	struct gfs2_sbd *sdp = GFS2_SB(inode);
 	struct posix_acl *acl;
 	int type;
 	int error;
 
+	if (!sdp->sd_args.ar_posix_acl)
+		return -EOPNOTSUPP;
+
 	type = gfs2_acl_type(name);
 	if (type < 0)
 		return type;