---

yaml --- r: 253837 b: refs/heads/master c: 730e908 h: refs/heads/master i: 253835: 54e2b84 v: v3
git-mirror · Jun 20, 2011 · be9987b · be9987b
1 parent bec1c69
commit be9987b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 7 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a63ab94d67879bc0630ea9821c582ddf58ba5527
+refs/heads/master: 730e908f3539066d4aa01f4720ebfc750ce4d045
diff --git a/trunk/fs/nilfs2/inode.c b/trunk/fs/nilfs2/inode.c
@@ -801,12 +801,7 @@ int nilfs_setattr(struct dentry *dentry, struct iattr *iattr)
 
 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 */