From: Al Viro <viro@zeniv.linux.org.uk>
Date: Sun, 14 Jul 2013 13:43:25 +0000 (+0400)
Subject: make simple_lookup() usable for filesystems that set ->s_d_op
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=74931da7a6d341c137f1564a47f36fda68ad21e6;p=linux.git

make simple_lookup() usable for filesystems that set ->s_d_op

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
---

diff --git a/fs/libfs.c b/fs/libfs.c
index c3a0837fb861d..3a3a9b53bf5a9 100644
--- a/fs/libfs.c
+++ b/fs/libfs.c
@@ -61,7 +61,8 @@ struct dentry *simple_lookup(struct inode *dir, struct dentry *dentry, unsigned
 
 	if (dentry->d_name.len > NAME_MAX)
 		return ERR_PTR(-ENAMETOOLONG);
-	d_set_d_op(dentry, &simple_dentry_operations);
+	if (!dentry->d_sb->s_d_op)
+		d_set_d_op(dentry, &simple_dentry_operations);
 	d_add(dentry, NULL);
 	return NULL;
 }