From: Andreas Gruenbacher <andreas.gruenbacher@gmail.com>
To: Alexander Viro <viro@zeniv.linux.org.uk>,
"Theodore Ts'o" <tytso@mit.edu>,
Andreas Dilger <adilger.kernel@dilger.ca>,
"J. Bruce Fields" <bfields@fieldses.org>,
Jeff Layton <jlayton@poochiereds.net>,
Trond Myklebust <trond.myklebust@primarydata.com>,
Anna Schumaker <anna.schumaker@netapp.com>,
Dave Chinner <david@fromorbit.com>,
linux-ext4@vger.kernel.org, xfs@oss.sgi.com,
linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org,
linux-nfs@vger.kernel.org, linux-cifs@vger.kernel.org,
linux-api@vger.kernel.org
Cc: Andreas Gruenbacher <agruenba@redhat.com>
Subject: [PATCH v10 22/46] xfs: Fix error path in xfs_get_acl
Date: Mon, 12 Oct 2015 00:58:33 +0200 [thread overview]
Message-ID: <1444604337-17651-23-git-send-email-andreas.gruenbacher@gmail.com> (raw)
In-Reply-To: <1444604337-17651-1-git-send-email-andreas.gruenbacher@gmail.com>
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
WARNING: multiple messages have this Message-ID (diff)
From: Andreas Gruenbacher <andreas.gruenbacher@gmail.com>
To: Alexander Viro <viro@zeniv.linux.org.uk>,
Theodore Ts'o <tytso@mit.edu>,
Andreas Dilger <adilger.kernel@dilger.ca>,
"J. Bruce Fields" <bfields@fieldses.org>,
Jeff Layton <jlayton@poochiereds.net>,
Trond Myklebust <trond.myklebust@primarydata.com>,
Anna Schumaker <anna.schumaker@netapp.com>,
Dave Chinner <david@fromorbit.com>,
linux-ext4@vger.kernel.org, xfs@oss.sgi.com,
linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org,
linux-nfs@vger.kernel.org, linux-cifs@vger.kernel.org,
linux-api@vger.kernel.org
Cc: Andreas Gruenbacher <agruenba@redhat.com>
Subject: [PATCH v10 22/46] xfs: Fix error path in xfs_get_acl
Date: Mon, 12 Oct 2015 00:58:33 +0200 [thread overview]
Message-ID: <1444604337-17651-23-git-send-email-andreas.gruenbacher@gmail.com> (raw)
In-Reply-To: <1444604337-17651-1-git-send-email-andreas.gruenbacher@gmail.com>
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
_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs
next prev parent reply other threads:[~2015-10-11 22:58 UTC|newest]
Thread overview: 126+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-10-11 22:58 [PATCH v10 00/46] Richacls Andreas Gruenbacher
2015-10-11 22:58 ` Andreas Gruenbacher
2015-10-11 22:58 ` [PATCH v10 01/46] vfs: Add IS_ACL() and IS_RICHACL() tests Andreas Gruenbacher
2015-10-11 22:58 ` Andreas Gruenbacher
2015-10-11 22:58 ` [PATCH v10 02/46] vfs: Add MAY_CREATE_FILE and MAY_CREATE_DIR permission flags Andreas Gruenbacher
2015-10-11 22:58 ` Andreas Gruenbacher
2015-10-11 22:58 ` [PATCH v10 03/46] vfs: Add MAY_DELETE_SELF and MAY_DELETE_CHILD " Andreas Gruenbacher
2015-10-11 22:58 ` Andreas Gruenbacher
2015-10-11 22:58 ` [PATCH v10 04/46] vfs: Make the inode passed to inode_change_ok non-const Andreas Gruenbacher
2015-10-11 22:58 ` Andreas Gruenbacher
2015-10-11 22:58 ` [PATCH v10 05/46] vfs: Add permission flags for setting file attributes Andreas Gruenbacher
2015-10-11 22:58 ` Andreas Gruenbacher
2015-10-11 22:58 ` [PATCH v10 06/46] richacl: In-memory representation and helper functions Andreas Gruenbacher
2015-10-11 22:58 ` Andreas Gruenbacher
2015-10-11 22:58 ` [PATCH v10 07/46] richacl: Permission mapping functions Andreas Gruenbacher
2015-10-11 22:58 ` Andreas Gruenbacher
2015-10-11 22:58 ` [PATCH v10 08/46] richacl: Compute maximum file masks from an acl Andreas Gruenbacher
2015-10-11 22:58 ` Andreas Gruenbacher
2015-10-11 22:58 ` [PATCH v10 09/46] richacl: Permission check algorithm Andreas Gruenbacher
2015-10-11 22:58 ` Andreas Gruenbacher
[not found] ` <1444604337-17651-1-git-send-email-andreas.gruenbacher-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2015-10-11 22:58 ` [PATCH v10 10/46] vfs: Cache base_acl objects in inodes Andreas Gruenbacher
2015-10-11 22:58 ` Andreas Gruenbacher
2015-10-11 22:58 ` Andreas Gruenbacher
2015-10-11 22:58 ` [PATCH v10 11/46] vfs: Add get_richacl and set_richacl inode operations Andreas Gruenbacher
2015-10-11 22:58 ` Andreas Gruenbacher
2015-10-11 22:58 ` [PATCH v10 12/46] vfs: Cache richacl in struct inode Andreas Gruenbacher
2015-10-11 22:58 ` Andreas Gruenbacher
2015-10-11 22:58 ` [PATCH v10 13/46] richacl: Update the file masks in chmod() Andreas Gruenbacher
2015-10-11 22:58 ` Andreas Gruenbacher
2015-10-11 22:58 ` [PATCH v10 14/46] richacl: Check if an acl is equivalent to a file mode Andreas Gruenbacher
2015-10-11 22:58 ` Andreas Gruenbacher
2015-10-11 22:58 ` [PATCH v10 15/46] richacl: Create-time inheritance Andreas Gruenbacher
2015-10-11 22:58 ` Andreas Gruenbacher
2015-10-11 22:58 ` [PATCH v10 16/46] richacl: Automatic Inheritance Andreas Gruenbacher
2015-10-11 22:58 ` Andreas Gruenbacher
2015-10-11 22:58 ` [PATCH v10 17/46] richacl: xattr mapping functions Andreas Gruenbacher
2015-10-11 22:58 ` Andreas Gruenbacher
2015-10-11 22:58 ` [PATCH v10 18/46] richacl: Add richacl xattr handler Andreas Gruenbacher
2015-10-11 22:58 ` Andreas Gruenbacher
2015-10-11 22:58 ` [PATCH v10 19/46] vfs: Add richacl permission checking Andreas Gruenbacher
2015-10-11 22:58 ` Andreas Gruenbacher
2015-10-11 22:58 ` [PATCH v10 20/46] ext4: Add richacl support Andreas Gruenbacher
2015-10-11 22:58 ` Andreas Gruenbacher
2015-10-11 22:58 ` [PATCH v10 21/46] ext4: Add richacl feature flag Andreas Gruenbacher
2015-10-11 22:58 ` Andreas Gruenbacher
2015-10-11 22:58 ` Andreas Gruenbacher [this message]
2015-10-11 22:58 ` [PATCH v10 22/46] xfs: Fix error path in xfs_get_acl Andreas Gruenbacher
2015-10-11 22:58 ` [PATCH v10 23/46] xfs: Make xfs_set_mode non-static Andreas Gruenbacher
2015-10-11 22:58 ` Andreas Gruenbacher
2015-10-11 23:37 ` Dave Chinner
2015-10-11 23:37 ` Dave Chinner
2015-10-11 22:58 ` [PATCH v10 24/46] xfs: Add richacl support Andreas Gruenbacher
2015-10-11 22:58 ` Andreas Gruenbacher
[not found] ` <1444604337-17651-25-git-send-email-andreas.gruenbacher-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2015-10-12 0:10 ` Dave Chinner
2015-10-12 0:10 ` Dave Chinner
2015-10-12 0:10 ` Dave Chinner
2015-10-12 1:51 ` Andreas Grünbacher
2015-10-12 1:51 ` Andreas Grünbacher
2015-10-12 1:51 ` Andreas Grünbacher
[not found] ` <CAHpGcMKeJHDegs2cYKaJdX4Tw43Jp30Nv_2WoSNZfBzGJKu=BQ-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2015-10-12 4:05 ` Dave Chinner
2015-10-12 4:05 ` Dave Chinner
2015-10-12 4:05 ` Dave Chinner
2015-10-12 5:57 ` Andreas Gruenbacher
2015-10-12 5:57 ` Andreas Gruenbacher
2015-10-12 5:57 ` Andreas Gruenbacher
[not found] ` <CAHc6FU55eOK4gWH1bhKvoujQ1zkT+we0xcfPUOeWrF_X0XHXZg-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2015-10-13 19:21 ` Austin S Hemmelgarn
2015-10-13 19:21 ` Austin S Hemmelgarn
2015-10-13 19:21 ` Austin S Hemmelgarn
2015-10-13 13:39 ` Andreas Gruenbacher
2015-10-13 13:39 ` Andreas Gruenbacher
2015-10-13 13:39 ` Andreas Gruenbacher
2015-10-11 22:58 ` [PATCH v10 25/46] richacl: acl editing helper functions Andreas Gruenbacher
2015-10-11 22:58 ` Andreas Gruenbacher
2015-10-11 22:58 ` [PATCH v10 26/46] richacl: Move everyone@ aces down the acl Andreas Gruenbacher
2015-10-11 22:58 ` Andreas Gruenbacher
2015-10-11 22:58 ` [PATCH v10 27/46] richacl: Propagate everyone@ permissions to other aces Andreas Gruenbacher
2015-10-11 22:58 ` Andreas Gruenbacher
2015-10-11 22:58 ` [PATCH v10 28/46] richacl: Set the owner permissions to the owner mask Andreas Gruenbacher
2015-10-11 22:58 ` Andreas Gruenbacher
2015-10-11 22:58 ` [PATCH v10 29/46] richacl: Set the other permissions to the other mask Andreas Gruenbacher
2015-10-11 22:58 ` Andreas Gruenbacher
2015-10-11 22:58 ` [PATCH v10 30/46] richacl: Isolate the owner and group classes Andreas Gruenbacher
2015-10-11 22:58 ` Andreas Gruenbacher
2015-10-11 22:58 ` [PATCH v10 31/46] richacl: Apply the file masks to a richacl Andreas Gruenbacher
2015-10-11 22:58 ` Andreas Gruenbacher
2015-10-11 22:58 ` [PATCH v10 32/46] richacl: Create richacl from mode values Andreas Gruenbacher
2015-10-11 22:58 ` Andreas Gruenbacher
2015-10-11 22:58 ` [PATCH v10 33/46] nfsd: Keep list of acls to dispose of in compoundargs Andreas Gruenbacher
2015-10-11 22:58 ` Andreas Gruenbacher
2015-10-11 22:58 ` [PATCH v10 34/46] nfsd: Use richacls as internal acl representation Andreas Gruenbacher
2015-10-11 22:58 ` Andreas Gruenbacher
2015-10-11 22:58 ` [PATCH v10 35/46] nfsd: Add richacl support Andreas Gruenbacher
2015-10-11 22:58 ` Andreas Gruenbacher
2015-10-11 22:58 ` [PATCH v10 36/46] nfsd: Add support for the v4.1 dacl attribute Andreas Gruenbacher
2015-10-11 22:58 ` Andreas Gruenbacher
2015-10-11 22:58 ` [PATCH v10 37/46] nfsd: Add support for the MAY_CREATE_{FILE, DIR} permissions Andreas Gruenbacher
2015-10-11 22:58 ` [PATCH v10 37/46] nfsd: Add support for the MAY_CREATE_{FILE,DIR} permissions Andreas Gruenbacher
2015-10-11 22:58 ` [PATCH v10 38/46] richacl: Add support for unmapped identifiers Andreas Gruenbacher
2015-10-11 22:58 ` Andreas Gruenbacher
2015-10-12 0:22 ` Dave Chinner
2015-10-12 0:22 ` Dave Chinner
2015-10-12 1:53 ` Andreas Grünbacher
2015-10-12 1:53 ` Andreas Grünbacher
2015-10-12 1:53 ` Andreas Grünbacher
2015-10-11 22:58 ` [PATCH v10 39/46] ext4: Don't allow unmapped identifiers in richacls Andreas Gruenbacher
2015-10-11 22:58 ` Andreas Gruenbacher
2015-10-11 22:58 ` [PATCH v10 40/46] sunrpc: Allow to demand-allocate pages to encode into Andreas Gruenbacher
2015-10-11 22:58 ` Andreas Gruenbacher
2015-10-11 22:58 ` [PATCH v10 41/46] sunrpc: Add xdr_init_encode_pages Andreas Gruenbacher
2015-10-11 22:58 ` Andreas Gruenbacher
2015-10-11 22:58 ` [PATCH v10 42/46] nfs: Fix GETATTR bitmap verification Andreas Gruenbacher
2015-10-11 22:58 ` Andreas Gruenbacher
2015-10-11 22:58 ` [PATCH v10 43/46] nfs: Remove unused xdr page offsets in getacl/setacl arguments Andreas Gruenbacher
2015-10-11 22:58 ` Andreas Gruenbacher
2015-10-11 22:58 ` [PATCH v10 44/46] nfs: Add richacl support Andreas Gruenbacher
2015-10-11 22:58 ` Andreas Gruenbacher
[not found] ` <1444604337-17651-45-git-send-email-andreas.gruenbacher-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2015-10-12 14:39 ` Anna Schumaker
2015-10-12 14:39 ` Anna Schumaker
2015-10-12 14:39 ` Anna Schumaker
2015-10-12 14:39 ` Anna Schumaker
2015-10-12 19:49 ` Andreas Gruenbacher
2015-10-12 19:49 ` Andreas Gruenbacher
2015-10-11 22:58 ` [PATCH v10 45/46] nfs: Add support for the v4.1 dacl attribute Andreas Gruenbacher
2015-10-11 22:58 ` Andreas Gruenbacher
2015-10-11 22:58 ` [PATCH v10 46/46] richacl: uapi header split Andreas Gruenbacher
2015-10-11 22:58 ` Andreas Gruenbacher
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1444604337-17651-23-git-send-email-andreas.gruenbacher@gmail.com \
--to=andreas.gruenbacher@gmail.com \
--cc=adilger.kernel@dilger.ca \
--cc=agruenba@redhat.com \
--cc=anna.schumaker@netapp.com \
--cc=bfields@fieldses.org \
--cc=david@fromorbit.com \
--cc=jlayton@poochiereds.net \
--cc=linux-api@vger.kernel.org \
--cc=linux-cifs@vger.kernel.org \
--cc=linux-ext4@vger.kernel.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-nfs@vger.kernel.org \
--cc=trond.myklebust@primarydata.com \
--cc=tytso@mit.edu \
--cc=viro@zeniv.linux.org.uk \
--cc=xfs@oss.sgi.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.