Linux 3.11-rc5

[linux-imx.git] / fs / libfs.c

diff --git a/fs/libfs.c b/fs/libfs.c
index c3a0837fb861d8d403e6b3b7fadd4056aa42df79..3a3a9b53bf5a974d3c206f31ae402aaf752dd39c 100644 (file)
--- 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;
 }