From: Miklos Szeredi <mszeredi@suse.cz>
Date: Mon, 21 Mar 2011 12:58:06 +0000 (+0100)
Subject: fuse: make fuse_dentry_revalidate() RCU aware
X-Git-Tag: v2.6.39-rc1~384^2
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=e7c0a167860620bd2938366896964f729ddaeaaa;p=~shefty%2Frdma-dev.git

fuse: make fuse_dentry_revalidate() RCU aware

Only bail out of fuse_dentry_revalidate() on LOOKUP_RCU when blocking
is actually necessary.

CC: Nick Piggin <npiggin@gmail.com>
Signed-off-by: Miklos Szeredi <mszeredi@suse.cz>
---

diff --git a/fs/fuse/dir.c b/fs/fuse/dir.c
index 3b84b913b16..c6ba49bd95b 100644
--- a/fs/fuse/dir.c
+++ b/fs/fuse/dir.c
@@ -158,10 +158,7 @@ static int fuse_dentry_revalidate(struct dentry *entry, struct nameidata *nd)
 {
 	struct inode *inode;
 
-	if (nd && nd->flags & LOOKUP_RCU)
-		return -ECHILD;
-
-	inode = entry->d_inode;
+	inode = ACCESS_ONCE(entry->d_inode);
 	if (inode && is_bad_inode(inode))
 		return 0;
 	else if (fuse_dentry_time(entry) < get_jiffies_64()) {
@@ -177,6 +174,9 @@ static int fuse_dentry_revalidate(struct dentry *entry, struct nameidata *nd)
 		if (!inode)
 			return 0;
 
+		if (nd->flags & LOOKUP_RCU)
+			return -ECHILD;
+
 		fc = get_fuse_conn(inode);
 		req = fuse_get_req(fc);
 		if (IS_ERR(req))