From: Christoph Hellwig <hch@lst.de>
To: Al Viro <viro@ZenIV.linux.org.uk>,
Linus Torvalds <torvalds@linux-foundation.org>
Cc: linux-fsdevel <linux-fsdevel@vger.kernel.org>
Subject: [PATCH 3/4] reiserfs: cache negative ACLs for v1 stat format
Date: Sat, 23 Jul 2011 17:37:03 +0200 [thread overview]
Message-ID: <20110723153703.GC10887@lst.de> (raw)
In-Reply-To: <20110723153621.GA10832@lst.de>
Always set up a negative ACL cache entry if the inode can't have ACLs.
That behaves much better than doing this check inside ->check_acl.
Also remove the left over MAY_NOT_BLOCK check.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Index: linux-2.6/fs/reiserfs/inode.c
===================================================================
--- linux-2.6.orig/fs/reiserfs/inode.c 2011-07-23 16:39:07.214083201 +0200
+++ linux-2.6/fs/reiserfs/inode.c 2011-07-23 16:39:41.154082998 +0200
@@ -1475,6 +1475,11 @@ void reiserfs_read_locked_inode(struct i
reiserfs_check_path(&path_to_sd); /* init inode should be relsing */
+ /*
+ * Stat data v1 doesn't support ACLs.
+ */
+ if (get_inode_sd_version(inode) == STAT_DATA_V1)
+ cache_no_acl(inode);
}
/**
Index: linux-2.6/fs/reiserfs/xattr.c
===================================================================
--- linux-2.6.orig/fs/reiserfs/xattr.c 2011-07-23 16:39:07.230749867 +0200
+++ linux-2.6/fs/reiserfs/xattr.c 2011-07-23 16:39:41.157416331 +0200
@@ -872,15 +872,6 @@ int reiserfs_check_acl(struct inode *ino
struct posix_acl *acl;
int error = -EAGAIN; /* do regular unix permission checks by default */
- /*
- * Stat data v1 doesn't support ACLs.
- */
- if (get_inode_sd_version(inode) == STAT_DATA_V1)
- return -EAGAIN;
-
- if (mask & MAY_NOT_BLOCK)
- return -ECHILD;
-
acl = reiserfs_get_acl(inode, ACL_TYPE_ACCESS);
if (acl) {
next prev parent reply other threads:[~2011-07-23 15:37 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-07-23 15:36 [PATCH 0/4] more ACL updates Christoph Hellwig
2011-07-23 15:36 ` [PATCH 1/4] 9p: do no return 0 from ->check_acl without actually checking Christoph Hellwig
2011-07-23 15:49 ` Al Viro
2011-07-25 6:40 ` Aneesh Kumar K.V
2011-07-23 15:36 ` [PATCH 2/4] xfs: cache negative ACLs if there is no attribute fork Christoph Hellwig
2011-07-23 15:37 ` Christoph Hellwig [this message]
2011-07-23 15:37 ` [PATCH 4/4] fs: take the ACL checks to common code Christoph Hellwig
2011-07-23 15:56 ` Linus Torvalds
2011-07-23 16:00 ` Christoph Hellwig
2011-07-23 16:15 ` Al Viro
2011-07-24 13:07 ` Christoph Hellwig
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=20110723153703.GC10887@lst.de \
--to=hch@lst.de \
--cc=linux-fsdevel@vger.kernel.org \
--cc=torvalds@linux-foundation.org \
--cc=viro@ZenIV.linux.org.uk \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).