Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 108312
b: refs/heads/master
c: 604323c
h: refs/heads/master
v: v3
  • Loading branch information
Christoph Hellwig authored and Lachlan McIlroy committed Aug 13, 2008
1 parent a19dbbc commit 1d422a7
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 7 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 863890cd90e8b213f7028036c6e2200d93223527
refs/heads/master: 604323ca760beebf00a07153706dcbe7128324e0
6 changes: 0 additions & 6 deletions trunk/fs/xfs/xfs_acl.c
Original file line number Diff line number Diff line change
Expand Up @@ -217,7 +217,6 @@ xfs_acl_vget(
posix_acl_xattr_header *ext_acl = acl;
int flags = 0;

VN_HOLD(vp);
if(size) {
if (!(_ACL_ALLOC(xfs_acl))) {
error = ENOMEM;
Expand All @@ -243,7 +242,6 @@ xfs_acl_vget(
error = -posix_acl_xfs_to_xattr(xfs_acl, ext_acl, size);
}
out:
VN_RELE(vp);
if(xfs_acl)
_ACL_FREE(xfs_acl);
return -error;
Expand All @@ -256,7 +254,6 @@ xfs_acl_vremove(
{
int error;

VN_HOLD(vp);
error = xfs_acl_allow_set(vp, kind);
if (!error) {
error = xfs_attr_remove(XFS_I(vp),
Expand All @@ -266,7 +263,6 @@ xfs_acl_vremove(
if (error == ENOATTR)
error = 0; /* 'scool */
}
VN_RELE(vp);
return -error;
}

Expand Down Expand Up @@ -298,7 +294,6 @@ xfs_acl_vset(
return 0;
}

VN_HOLD(vp);
error = xfs_acl_allow_set(vp, kind);

/* Incoming ACL exists, set file mode based on its value */
Expand All @@ -321,7 +316,6 @@ xfs_acl_vset(
}

out:
VN_RELE(vp);
_ACL_FREE(xfs_acl);
return -error;
}
Expand Down

0 comments on commit 1d422a7

Please sign in to comment.