[PATCH] fuse: clean up dead code related to nfs exporting

szmi · Linus Torvalds · commit f12ec44070f6 · 2005-10-30T17:37:21.000-08:00
Remove last remains of NFS exportability support.

The code is actually buggy (as reported by Akshat Aranya), since 'alias'
will be leaked if it's non-null and alias-&gt;d_flags has DCACHE_DISCONNECTED.

This is not an active bug, since there will never be any disconnected
dentries.  But it's better to get rid of the unnecessary complexity anyway.

Signed-off-by: Miklos Szeredi &lt;miklos@szeredi.hu&gt;
Signed-off-by: Andrew Morton &lt;akpm@osdl.org&gt;
Signed-off-by: Linus Torvalds &lt;torvalds@osdl.org&gt;
diff --git a/fs/fuse/dir.c b/fs/fuse/dir.c
@@ -741,13 +741,14 @@ static struct dentry *fuse_lookup(struct inode *dir, struct dentry *entry,
 	if (inode && S_ISDIR(inode->i_mode)) {
 		/* Don't allow creating an alias to a directory  */
 		struct dentry *alias = d_find_alias(inode);
-		if (alias && !(alias->d_flags & DCACHE_DISCONNECTED)) {
+		if (alias) {
 			dput(alias);
 			iput(inode);
 			return ERR_PTR(-EIO);
 		}
 	}
-	return d_splice_alias(inode, entry);
+	d_add(entry, inode);
+	return NULL;
 }
 
 static int fuse_setxattr(struct dentry *entry, const char *name,

Original file line number	Diff line number	Diff line change
`@@ -741,13 +741,14 @@ static struct dentry fuse_lookup(struct inode dir, struct dentry *entry,`
`741`	`741`	`if (inode && S_ISDIR(inode->i_mode)) {`
`742`	`742`	`/* Don't allow creating an alias to a directory */`
`743`	`743`	`struct dentry *alias = d_find_alias(inode);`
`744`		`- if (alias && !(alias->d_flags & DCACHE_DISCONNECTED)) {`
	`744`	`+ if (alias) {`
`745`	`745`	`dput(alias);`
`746`	`746`	`iput(inode);`
`747`	`747`	`return ERR_PTR(-EIO);`
`748`	`748`	`}`
`749`	`749`	`}`
`750`		`- return d_splice_alias(inode, entry);`
	`750`	`+ d_add(entry, inode);`
	`751`	`+ return NULL;`
`751`	`752`	`}`
`752`	`753`
`753`	`754`	`static int fuse_setxattr(struct dentry entry, const char name,`