diff options
author | Steven Whitehouse <swhiteho@redhat.com> | 2010-05-21 11:12:27 -0400 |
---|---|---|
committer | Steven Whitehouse <swhiteho@redhat.com> | 2010-05-21 11:12:27 -0400 |
commit | f72f2d2e2f3238e4dedf4afb5f9945b3227dd87e (patch) | |
tree | e5258ca011187b090c8cccb1caa109fabeb9c06b /fs | |
parent | ed4878e8a4f550fd357ce5144cfd412015f6a111 (diff) |
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')
-rw-r--r-- | fs/gfs2/acl.c | 4 |
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, | |||
236 | void *buffer, size_t size, int xtype) | 236 | void *buffer, size_t size, int xtype) |
237 | { | 237 | { |
238 | struct inode *inode = dentry->d_inode; | 238 | struct inode *inode = dentry->d_inode; |
239 | struct gfs2_sbd *sdp = GFS2_SB(inode); | ||
239 | struct posix_acl *acl; | 240 | struct posix_acl *acl; |
240 | int type; | 241 | int type; |
241 | int error; | 242 | int error; |
242 | 243 | ||
244 | if (!sdp->sd_args.ar_posix_acl) | ||
245 | return -EOPNOTSUPP; | ||
246 | |||
243 | type = gfs2_acl_type(name); | 247 | type = gfs2_acl_type(name); |
244 | if (type < 0) | 248 | if (type < 0) |
245 | return type; | 249 | return type; |