xfs: Fix error path in xfs_get_acl

Andreas Gruenbacher · dchinner · commit edfb8ebce225 · 2015-11-10T10:09:45.000+11:00
Error codes from xfs_attr_get other than -ENOATTR were not properly
reported.  Fix that.

In addition, the declaration of struct xfs_inode in xfs_acl.h isn't needed.

Signed-off-by: Andreas Gruenbacher &lt;agruenba@redhat.com&gt;
Reviewed-by: Dave Chinner &lt;dchinner@redhat.com&gt;
Signed-off-by: Dave Chinner &lt;david@fromorbit.com&gt;
diff --git a/fs/xfs/xfs_acl.c b/fs/xfs/xfs_acl.c
@@ -163,6 +163,7 @@ xfs_get_acl(struct inode *inode, int type)
 		 */
 		if (error == -ENOATTR)
 			goto out_update_cache;
+		acl = ERR_PTR(error);
 		goto out;
 	}
 
diff --git a/fs/xfs/xfs_acl.h b/fs/xfs/xfs_acl.h
@@ -20,7 +20,6 @@
 
 struct inode;
 struct posix_acl;
-struct xfs_inode;
 
 #ifdef CONFIG_XFS_POSIX_ACL
 extern struct posix_acl *xfs_get_acl(struct inode *inode, int type);

Original file line number	Diff line number	Diff line change
`@@ -163,6 +163,7 @@ xfs_get_acl(struct inode *inode, int type)`
`163`	`163`	`*/`
`164`	`164`	`if (error == -ENOATTR)`
`165`	`165`	`goto out_update_cache;`
	`166`	`+ acl = ERR_PTR(error);`
`166`	`167`	`goto out;`
`167`	`168`	`}`
`168`	`169`