From cba797e055532574091019e94f6169d2bb1ae6e1 Mon Sep 17 00:00:00 2001 From: Nick Piggin Date: Fri, 7 Jan 2011 17:50:00 +1100 Subject: [PATCH] --- yaml --- r: 226732 b: refs/heads/master c: 73598611ade7c85f0c3d52ba5130103f6709c6d3 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/fs/ext2/acl.c | 7 +++++-- trunk/fs/ext3/acl.c | 7 +++++-- trunk/fs/ext4/acl.c | 7 +++++-- 4 files changed, 16 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index be0439a78d9d..865a634d2d8c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1e1743ebe35ec7e3c1fa732408358fbc614cbbe5 +refs/heads/master: 73598611ade7c85f0c3d52ba5130103f6709c6d3 diff --git a/trunk/fs/ext2/acl.c b/trunk/fs/ext2/acl.c index dd9bb3f0c8d7..7b4180554a62 100644 --- a/trunk/fs/ext2/acl.c +++ b/trunk/fs/ext2/acl.c @@ -236,8 +236,11 @@ ext2_check_acl(struct inode *inode, int mask, unsigned int flags) { struct posix_acl *acl; - if (flags & IPERM_FLAG_RCU) - return -ECHILD; + if (flags & IPERM_FLAG_RCU) { + if (!negative_cached_acl(inode, ACL_TYPE_ACCESS)) + return -ECHILD; + return -EAGAIN; + } acl = ext2_get_acl(inode, ACL_TYPE_ACCESS); if (IS_ERR(acl)) diff --git a/trunk/fs/ext3/acl.c b/trunk/fs/ext3/acl.c index 9e49da8302d3..e4fa49e6c539 100644 --- a/trunk/fs/ext3/acl.c +++ b/trunk/fs/ext3/acl.c @@ -244,8 +244,11 @@ ext3_check_acl(struct inode *inode, int mask, unsigned int flags) { struct posix_acl *acl; - if (flags & IPERM_FLAG_RCU) - return -ECHILD; + if (flags & IPERM_FLAG_RCU) { + if (!negative_cached_acl(inode, ACL_TYPE_ACCESS)) + return -ECHILD; + return -EAGAIN; + } acl = ext3_get_acl(inode, ACL_TYPE_ACCESS); if (IS_ERR(acl)) diff --git a/trunk/fs/ext4/acl.c b/trunk/fs/ext4/acl.c index 373dcaeedba9..e0270d1f8d82 100644 --- a/trunk/fs/ext4/acl.c +++ b/trunk/fs/ext4/acl.c @@ -242,8 +242,11 @@ ext4_check_acl(struct inode *inode, int mask, unsigned int flags) { struct posix_acl *acl; - if (flags & IPERM_FLAG_RCU) - return -ECHILD; + if (flags & IPERM_FLAG_RCU) { + if (!negative_cached_acl(inode, ACL_TYPE_ACCESS)) + return -ECHILD; + return -EAGAIN; + } acl = ext4_get_acl(inode, ACL_TYPE_ACCESS); if (IS_ERR(acl))