diff options
| author | Steven Whitehouse <swhiteho@redhat.com> | 2006-05-25 18:40:08 +0200 |
|---|---|---|
| committer | Steven Whitehouse <swhiteho@redhat.com> | 2006-05-25 18:40:08 +0200 |
| commit | c6a756795d5ba0637aae8da89dd11bb7e3a1ee74 (patch) | |
| tree | 1c19f951f2604dbb6b867a6dcdf94d20c204cc5c /fs/nfsd/vfs.c | |
| parent | [GFS2] Casts for printing 64bit numbers (diff) | |
| parent | Linux 2.6.17-rc5 (diff) | |
| download | linux-c6a756795d5ba0637aae8da89dd11bb7e3a1ee74.tar.xz linux-c6a756795d5ba0637aae8da89dd11bb7e3a1ee74.zip | |
Merge branch 'master'
Diffstat (limited to 'fs/nfsd/vfs.c')
| -rw-r--r-- | fs/nfsd/vfs.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/fs/nfsd/vfs.c b/fs/nfsd/vfs.c index 6aa92d0e6876..1d65f13f458c 100644 --- a/fs/nfsd/vfs.c +++ b/fs/nfsd/vfs.c @@ -1922,11 +1922,10 @@ nfsd_set_posix_acl(struct svc_fh *fhp, int type, struct posix_acl *acl) value = kmalloc(size, GFP_KERNEL); if (!value) return -ENOMEM; - size = posix_acl_to_xattr(acl, value, size); - if (size < 0) { - error = size; + error = posix_acl_to_xattr(acl, value, size); + if (error < 0) goto getout; - } + size = error; } else size = 0; |