diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-05-25 08:17:51 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-05-25 08:17:51 -0700 |
| commit | f16a5e347835c6a0ba958535cf6e6c89d50463b8 (patch) | |
| tree | 41d2e7784f57212a3f910690e00dcd1707a7e47f /fs/gfs2/acl.c | |
| parent | 110b93842e36b17598cf24874e90d0401431cda2 (diff) | |
| parent | 7df0e0397b9a18358573274db9fdab991941062f (diff) | |
| download | linux-f16a5e347835c6a0ba958535cf6e6c89d50463b8.tar.bz2 | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-fixes
* git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-fixes:
GFS2: Fix permissions checking for setflags ioctl()
GFS2: Don't "get" xattrs for ACLs when ACLs are turned off
GFS2: Rework reclaiming unlinked dinodes
Diffstat (limited to 'fs/gfs2/acl.c')
| -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 9fb76b0a0485..48171f4c943d 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; |