From: David Chinner <dgc@sgi.com>
Date: Thu, 10 Apr 2008 02:21:04 +0000 (+1000)
Subject: [XFS] Catch errors from xfs_acl_vremove().
X-Git-Tag: v2.6.26-rc1~1147^2~32
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=5ca1f261a08d5cff5f29eaa0887b59baae2ae7f7;p=linux-2.6-omap-h63xx.git

[XFS] Catch errors from xfs_acl_vremove().

Removing an ACL can return an error. Propagate it.

SGI-PV: 980084
SGI-Modid: xfs-linux-melb:xfs-kern:30793a

Signed-off-by: David Chinner <dgc@sgi.com>
Signed-off-by: Niv Sardi <xaiki@sgi.com>
Signed-off-by: Lachlan McIlroy <lachlan@sgi.com>
---

diff --git a/fs/xfs/xfs_acl.c b/fs/xfs/xfs_acl.c
index 98b515d3918..8e130b9720a 100644
--- a/fs/xfs/xfs_acl.c
+++ b/fs/xfs/xfs_acl.c
@@ -324,7 +324,7 @@ xfs_acl_vset(
 	if (!basicperms) {
 		xfs_acl_set_attr(vp, xfs_acl, kind, &error);
 	} else {
-		xfs_acl_vremove(vp, _ACL_TYPE_ACCESS);
+		error = -xfs_acl_vremove(vp, _ACL_TYPE_ACCESS);
 	}
 
 out: