diff options
| author |   Andreas Gruenbacher <agruenba@redhat.com> | 2015-11-10 10:09:45 +1100 |
|---|---|---|
| committer |   Dave Chinner <david@fromorbit.com> | 2015-11-10 10:09:45 +1100 |
| commit | edfb8ebce225a0638cf62591d4ccb502f052ffd4 (patch) | |
| tree | 4a5a01b0f38928b47f304dcfc564e3bb3c719440 /fs | |
| parent | xfs: optimise away log forces on timestamp updates for fdatasync (diff) | |
| download | linux-dev-edfb8ebce225a0638cf62591d4ccb502f052ffd4.tar.xz linux-dev-edfb8ebce225a0638cf62591d4ccb502f052ffd4.zip | |
xfs: Fix error path in xfs_get_acl
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 <agruenba@redhat.com>
Reviewed-by: Dave Chinner <dchinner@redhat.com>
Signed-off-by: Dave Chinner <david@fromorbit.com>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/xfs/xfs_acl.c | 1 | ||||
| -rw-r--r-- | fs/xfs/xfs_acl.h | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/fs/xfs/xfs_acl.c b/fs/xfs/xfs_acl.c index 763e36560681..6bb470fbb8e8 100644 --- 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 index 75af0a4d9028..52f8255d6bdf 100644 --- 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); |