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

Al Viro · Al Viro · commit 74931da7a6d3 · 2013-07-14T17:43:25.000+04:00
Signed-off-by: Al Viro &lt;viro@zeniv.linux.org.uk&gt;
diff --git 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;
 }

Original file line number	Diff line number	Diff line change
`@@ -61,7 +61,8 @@ struct dentry simple_lookup(struct inode dir, struct dentry *dentry, unsigned`
`61`	`61`
`62`	`62`	`if (dentry->d_name.len > NAME_MAX)`
`63`	`63`	`return ERR_PTR(-ENAMETOOLONG);`
`64`		`- d_set_d_op(dentry, &simple_dentry_operations);`
	`64`	`+ if (!dentry->d_sb->s_d_op)`
	`65`	`+ d_set_d_op(dentry, &simple_dentry_operations);`
`65`	`66`	`d_add(dentry, NULL);`
`66`	`67`	`return NULL;`
`67`	`68`	`}`