summaryrefslogtreecommitdiffstats
path: root/fs/gfs2
diff options
context:
space:
mode:
authorSteven Whitehouse <swhiteho@redhat.com>2010-05-21 16:12:27 +0100
committerSteven Whitehouse <swhiteho@redhat.com>2010-05-21 16:12:27 +0100
commitf72f2d2e2f3238e4dedf4afb5f9945b3227dd87e (patch)
treee5258ca011187b090c8cccb1caa109fabeb9c06b /fs/gfs2
parented4878e8a4f550fd357ce5144cfd412015f6a111 (diff)
downloadlinux-f72f2d2e2f3238e4dedf4afb5f9945b3227dd87e.tar.bz2
GFS2: Don't "get" xattrs for ACLs when ACLs are turned off
This is to match ext3 behaviour. We should not allow getting of xattrs relating to ACLs when ACLs are turned off. Reported-by: Nate Straz <nstraz@redhat.com> Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
Diffstat (limited to 'fs/gfs2')
-rw-r--r--fs/gfs2/acl.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/fs/gfs2/acl.c b/fs/gfs2/acl.c
index 87ee309d4c24..ca991d776592 100644
--- a/fs/gfs2/acl.c
+++ b/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;