summaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2011-06-18 20:21:44 -0400
committerAl Viro <viro@zeniv.linux.org.uk>2011-06-20 10:44:33 -0400
commit730e908f3539066d4aa01f4720ebfc750ce4d045 (patch)
treede7b93574d60071b5d2c428cc3ff1a524eac3cd0 /fs
parenta63ab94d67879bc0630ea9821c582ddf58ba5527 (diff)
downloadop-kernel-dev-730e908f3539066d4aa01f4720ebfc750ce4d045.zip
op-kernel-dev-730e908f3539066d4aa01f4720ebfc750ce4d045.tar.gz
nilfs2_permission() doesn't need to bail out in RCU mode
Nothing blocking except for generic_permission(). Which will DTRT. Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs')
-rw-r--r--fs/nilfs2/inode.c7
1 files changed, 1 insertions, 6 deletions
diff --git a/fs/nilfs2/inode.c b/fs/nilfs2/inode.c
index b954878..b9b45fc 100644
--- a/fs/nilfs2/inode.c
+++ b/fs/nilfs2/inode.c
@@ -801,12 +801,7 @@ out_err:
int nilfs_permission(struct inode *inode, int mask, unsigned int flags)
{
- struct nilfs_root *root;
-
- if (flags & IPERM_FLAG_RCU)
- return -ECHILD;
-
- root = NILFS_I(inode)->i_root;
+ struct nilfs_root *root = NILFS_I(inode)->i_root;
if ((mask & MAY_WRITE) && root &&
root->cno != NILFS_CPTREE_CURRENT_CNO)
return -EROFS; /* snapshot is not writable */
OpenPOWER on IntegriCloud