Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1244268
| From | Andreas Gruenbacher <andreas.gruenbacher@gmail.com> |
|---|---|
| Newsgroups | linux.kernel |
| Subject | [PATCH v10 22/46] xfs: Fix error path in xfs_get_acl |
| Date | 2015-10-12 01:10 +0200 |
| Message-ID | <qixUD-61y-47@gated-at.bofh.it> (permalink) |
| References | <qixKV-5z8-9@gated-at.bofh.it> |
| Organization | linux.* mail to news gateway |
From: Andreas Gruenbacher <agruenba@redhat.com>
Error codes from xfs_attr_get other than -ENOATTR were not properly
reported. Fix that, and clean the code up somewhat.
In addition, the declaration of struct xfs_inode in xfs_acl.h isn't needed.
Signed-off-by: Andreas Gruenbacher <agruenba@redhat.com>
---
fs/xfs/xfs_acl.c | 19 +++++++------------
fs/xfs/xfs_acl.h | 1 -
2 files changed, 7 insertions(+), 13 deletions(-)
diff --git a/fs/xfs/xfs_acl.c b/fs/xfs/xfs_acl.c
index 4b64167..0f4ee92 100644
--- a/fs/xfs/xfs_acl.c
+++ b/fs/xfs/xfs_acl.c
@@ -122,7 +122,7 @@ struct posix_acl *
xfs_get_acl(struct inode *inode, int type)
{
struct xfs_inode *ip = XFS_I(inode);
- struct posix_acl *acl = NULL;
+ struct posix_acl *acl;
struct xfs_acl *xfs_acl;
unsigned char *ea_name;
int error;
@@ -158,18 +158,13 @@ xfs_get_acl(struct inode *inode, int type)
* cache entry, for any other error assume it is transient and
* leave the cache entry as ACL_NOT_CACHED.
*/
- if (error == -ENOATTR)
- goto out_update_cache;
- goto out;
- }
+ acl = (error == -ENOATTR) ? NULL : ERR_PTR(error);
+ } else
+ acl = xfs_acl_from_disk(xfs_acl,
+ XFS_ACL_MAX_ENTRIES(ip->i_mount));
- acl = xfs_acl_from_disk(xfs_acl, XFS_ACL_MAX_ENTRIES(ip->i_mount));
- if (IS_ERR(acl))
- goto out;
-
-out_update_cache:
- set_cached_acl(inode, type, acl);
-out:
+ if (!IS_ERR(acl))
+ set_cached_acl(inode, type, acl);
kmem_free(xfs_acl);
return acl;
}
diff --git a/fs/xfs/xfs_acl.h b/fs/xfs/xfs_acl.h
index 3841b07..9ee0a0d 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);
--
2.5.0
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread
[PATCH v10 00/46] Richacls Andreas Gruenbacher <andreas.gruenbacher@gmail.com> - 2015-10-12 01:00 +0200
[PATCH v10 37/46] nfsd: Add support for the MAY_CREATE_{FILE,DIR} permissions Andreas Gruenbacher <andreas.gruenbacher@gmail.com> - 2015-10-12 01:10 +0200
[PATCH v10 35/46] nfsd: Add richacl support Andreas Gruenbacher <andreas.gruenbacher@gmail.com> - 2015-10-12 01:10 +0200
[PATCH v10 27/46] richacl: Propagate everyone@ permissions to other aces Andreas Gruenbacher <andreas.gruenbacher@gmail.com> - 2015-10-12 01:10 +0200
[PATCH v10 17/46] richacl: xattr mapping functions Andreas Gruenbacher <andreas.gruenbacher@gmail.com> - 2015-10-12 01:10 +0200
[PATCH v10 23/46] xfs: Make xfs_set_mode non-static Andreas Gruenbacher <andreas.gruenbacher@gmail.com> - 2015-10-12 01:10 +0200
Re: [PATCH v10 23/46] xfs: Make xfs_set_mode non-static Dave Chinner <david@fromorbit.com> - 2015-10-12 01:50 +0200
[PATCH v10 43/46] nfs: Remove unused xdr page offsets in getacl/setacl arguments Andreas Gruenbacher <andreas.gruenbacher@gmail.com> - 2015-10-12 01:10 +0200
[PATCH v10 24/46] xfs: Add richacl support Andreas Gruenbacher <andreas.gruenbacher@gmail.com> - 2015-10-12 01:10 +0200
Re: [PATCH v10 24/46] xfs: Add richacl support Dave Chinner <david@fromorbit.com> - 2015-10-12 02:20 +0200
Re: [PATCH v10 24/46] xfs: Add richacl support Andreas Grünbacher <andreas.gruenbacher@gmail.com> - 2015-10-12 04:00 +0200
Re: [PATCH v10 24/46] xfs: Add richacl support Dave Chinner <david@fromorbit.com> - 2015-10-12 06:10 +0200
Re: [PATCH v10 24/46] xfs: Add richacl support Andreas Gruenbacher <agruenba@redhat.com> - 2015-10-12 08:00 +0200
Re: [PATCH v10 24/46] xfs: Add richacl support Austin S Hemmelgarn <ahferroin7@gmail.com> - 2015-10-13 21:30 +0200
Re: [PATCH v10 24/46] xfs: Add richacl support Andreas Gruenbacher <agruenba@redhat.com> - 2015-10-13 15:40 +0200
[PATCH v10 28/46] richacl: Set the owner permissions to the owner mask Andreas Gruenbacher <andreas.gruenbacher@gmail.com> - 2015-10-12 01:10 +0200
[PATCH v10 30/46] richacl: Isolate the owner and group classes Andreas Gruenbacher <andreas.gruenbacher@gmail.com> - 2015-10-12 01:10 +0200
[PATCH v10 19/46] vfs: Add richacl permission checking Andreas Gruenbacher <andreas.gruenbacher@gmail.com> - 2015-10-12 01:10 +0200
[PATCH v10 26/46] richacl: Move everyone@ aces down the acl Andreas Gruenbacher <andreas.gruenbacher@gmail.com> - 2015-10-12 01:10 +0200
[PATCH v10 18/46] richacl: Add richacl xattr handler Andreas Gruenbacher <andreas.gruenbacher@gmail.com> - 2015-10-12 01:10 +0200
[PATCH v10 42/46] nfs: Fix GETATTR bitmap verification Andreas Gruenbacher <andreas.gruenbacher@gmail.com> - 2015-10-12 01:10 +0200
[PATCH v10 36/46] nfsd: Add support for the v4.1 dacl attribute Andreas Gruenbacher <andreas.gruenbacher@gmail.com> - 2015-10-12 01:10 +0200
[PATCH v10 13/46] richacl: Update the file masks in chmod() Andreas Gruenbacher <andreas.gruenbacher@gmail.com> - 2015-10-12 01:10 +0200
[PATCH v10 32/46] richacl: Create richacl from mode values Andreas Gruenbacher <andreas.gruenbacher@gmail.com> - 2015-10-12 01:10 +0200
[PATCH v10 22/46] xfs: Fix error path in xfs_get_acl Andreas Gruenbacher <andreas.gruenbacher@gmail.com> - 2015-10-12 01:10 +0200
[PATCH v10 20/46] ext4: Add richacl support Andreas Gruenbacher <andreas.gruenbacher@gmail.com> - 2015-10-12 01:10 +0200
[PATCH v10 11/46] vfs: Add get_richacl and set_richacl inode operations Andreas Gruenbacher <andreas.gruenbacher@gmail.com> - 2015-10-12 01:10 +0200
[PATCH v10 14/46] richacl: Check if an acl is equivalent to a file mode Andreas Gruenbacher <andreas.gruenbacher@gmail.com> - 2015-10-12 01:10 +0200
[PATCH v10 33/46] nfsd: Keep list of acls to dispose of in compoundargs Andreas Gruenbacher <andreas.gruenbacher@gmail.com> - 2015-10-12 01:10 +0200
[PATCH v10 38/46] richacl: Add support for unmapped identifiers Andreas Gruenbacher <andreas.gruenbacher@gmail.com> - 2015-10-12 01:10 +0200
Re: [PATCH v10 38/46] richacl: Add support for unmapped identifiers Dave Chinner <david@fromorbit.com> - 2015-10-12 02:30 +0200
Re: [PATCH v10 38/46] richacl: Add support for unmapped identifiers Andreas Grünbacher <andreas.gruenbacher@gmail.com> - 2015-10-12 04:00 +0200
[PATCH v10 29/46] richacl: Set the other permissions to the other mask Andreas Gruenbacher <andreas.gruenbacher@gmail.com> - 2015-10-12 01:10 +0200
[PATCH v10 45/46] nfs: Add support for the v4.1 dacl attribute Andreas Gruenbacher <andreas.gruenbacher@gmail.com> - 2015-10-12 01:10 +0200
[PATCH v10 41/46] sunrpc: Add xdr_init_encode_pages Andreas Gruenbacher <andreas.gruenbacher@gmail.com> - 2015-10-12 01:10 +0200
[PATCH v10 46/46] richacl: uapi header split Andreas Gruenbacher <andreas.gruenbacher@gmail.com> - 2015-10-12 01:10 +0200
[PATCH v10 44/46] nfs: Add richacl support Andreas Gruenbacher <andreas.gruenbacher@gmail.com> - 2015-10-12 01:10 +0200
Re: [PATCH v10 44/46] nfs: Add richacl support Anna Schumaker <Anna.Schumaker@netapp.com> - 2015-10-12 16:40 +0200
Re: [PATCH v10 44/46] nfs: Add richacl support Andreas Gruenbacher <agruenba@redhat.com> - 2015-10-12 21:50 +0200
[PATCH v10 21/46] ext4: Add richacl feature flag Andreas Gruenbacher <andreas.gruenbacher@gmail.com> - 2015-10-12 01:10 +0200
[PATCH v10 25/46] richacl: acl editing helper functions Andreas Gruenbacher <andreas.gruenbacher@gmail.com> - 2015-10-12 01:10 +0200
[PATCH v10 15/46] richacl: Create-time inheritance Andreas Gruenbacher <andreas.gruenbacher@gmail.com> - 2015-10-12 01:10 +0200
[PATCH v10 31/46] richacl: Apply the file masks to a richacl Andreas Gruenbacher <andreas.gruenbacher@gmail.com> - 2015-10-12 01:10 +0200
[PATCH v10 40/46] sunrpc: Allow to demand-allocate pages to encode into Andreas Gruenbacher <andreas.gruenbacher@gmail.com> - 2015-10-12 01:20 +0200
[PATCH v10 39/46] ext4: Don't allow unmapped identifiers in richacls Andreas Gruenbacher <andreas.gruenbacher@gmail.com> - 2015-10-12 01:20 +0200
[PATCH v10 34/46] nfsd: Use richacls as internal acl representation Andreas Gruenbacher <andreas.gruenbacher@gmail.com> - 2015-10-12 01:20 +0200
[PATCH v10 16/46] richacl: Automatic Inheritance Andreas Gruenbacher <andreas.gruenbacher@gmail.com> - 2015-10-12 01:30 +0200
[PATCH v10 03/46] vfs: Add MAY_DELETE_SELF and MAY_DELETE_CHILD permission flags Andreas Gruenbacher <andreas.gruenbacher@gmail.com> - 2015-10-12 01:40 +0200
[PATCH v10 12/46] vfs: Cache richacl in struct inode Andreas Gruenbacher <andreas.gruenbacher@gmail.com> - 2015-10-12 01:40 +0200
[PATCH v10 09/46] richacl: Permission check algorithm Andreas Gruenbacher <andreas.gruenbacher@gmail.com> - 2015-10-12 01:40 +0200
[PATCH v10 10/46] vfs: Cache base_acl objects in inodes Andreas Gruenbacher <andreas.gruenbacher@gmail.com> - 2015-10-12 01:40 +0200
[PATCH v10 08/46] richacl: Compute maximum file masks from an acl Andreas Gruenbacher <andreas.gruenbacher@gmail.com> - 2015-10-12 01:40 +0200
[PATCH v10 04/46] vfs: Make the inode passed to inode_change_ok non-const Andreas Gruenbacher <andreas.gruenbacher@gmail.com> - 2015-10-12 01:40 +0200
[PATCH v10 05/46] vfs: Add permission flags for setting file attributes Andreas Gruenbacher <andreas.gruenbacher@gmail.com> - 2015-10-12 01:40 +0200
[PATCH v10 02/46] vfs: Add MAY_CREATE_FILE and MAY_CREATE_DIR permission flags Andreas Gruenbacher <andreas.gruenbacher@gmail.com> - 2015-10-12 01:40 +0200
[PATCH v10 01/46] vfs: Add IS_ACL() and IS_RICHACL() tests Andreas Gruenbacher <andreas.gruenbacher@gmail.com> - 2015-10-12 01:50 +0200
[PATCH v10 07/46] richacl: Permission mapping functions Andreas Gruenbacher <andreas.gruenbacher@gmail.com> - 2015-10-12 01:50 +0200
[PATCH v10 06/46] richacl: In-memory representation and helper functions Andreas Gruenbacher <andreas.gruenbacher@gmail.com> - 2015-10-12 01:50 +0200
csiph-web