switch fuse

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

switch fuse
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Al Viro
1 parent d93e34faf9
Showing 2 changed files with 4 additions and 7 deletions Side-by-side Diff
fs/fuse/dir.c
fs/fuse/inode.c
@@ -350,7 +350,6 @@
 	}
  
 	entry = newent ? newent : entry;
-	d_set_d_op(entry, &fuse_dentry_operations);
 	if (outarg_valid)
 		fuse_change_entry_timeout(entry, &outarg);
 	else
@@ -617,10 +617,8 @@
 		goto out_iput;
  
 	entry = d_obtain_alias(inode);
-	if (!IS_ERR(entry) && get_node_id(inode) != FUSE_ROOT_ID) {
-		d_set_d_op(entry, &fuse_dentry_operations);
+	if (!IS_ERR(entry) && get_node_id(inode) != FUSE_ROOT_ID)
 		fuse_invalidate_entry_cache(entry);
-	}
  
 	return entry;
  
  
@@ -719,10 +717,8 @@
 	}
  
 	parent = d_obtain_alias(inode);
-	if (!IS_ERR(parent) && get_node_id(inode) != FUSE_ROOT_ID) {
-		d_set_d_op(parent, &fuse_dentry_operations);
+	if (!IS_ERR(parent) && get_node_id(inode) != FUSE_ROOT_ID)
 		fuse_invalidate_entry_cache(parent);
-	}
  
 	return parent;
 }
@@ -989,6 +985,8 @@
 		iput(root);
 		goto err_put_conn;
 	}
+	/* only now - we want root dentry with NULL ->d_op */
+	sb->s_d_op = &fuse_dentry_operations;
  
 	init_req = fuse_request_alloc();
 	if (!init_req)
...	...	@@ -350,7 +350,6 @@
350	350	}
351	351
352	352	entry = newent ? newent : entry;
353		- d_set_d_op(entry, &fuse_dentry_operations);
354	353	if (outarg_valid)
355	354	fuse_change_entry_timeout(entry, &outarg);
356	355	else
...	...	@@ -617,10 +617,8 @@
617	617	goto out_iput;
618	618
619	619	entry = d_obtain_alias(inode);
620		- if (!IS_ERR(entry) && get_node_id(inode) != FUSE_ROOT_ID) {
621		- d_set_d_op(entry, &fuse_dentry_operations);
	620	+ if (!IS_ERR(entry) && get_node_id(inode) != FUSE_ROOT_ID)
622	621	fuse_invalidate_entry_cache(entry);
623		- }
624	622
625	623	return entry;
626	624
627	625
...	...	@@ -719,10 +717,8 @@
719	717	}
720	718
721	719	parent = d_obtain_alias(inode);
722		- if (!IS_ERR(parent) && get_node_id(inode) != FUSE_ROOT_ID) {
723		- d_set_d_op(parent, &fuse_dentry_operations);
	720	+ if (!IS_ERR(parent) && get_node_id(inode) != FUSE_ROOT_ID)
724	721	fuse_invalidate_entry_cache(parent);
725		- }
726	722
727	723	return parent;
728	724	}
...	...	@@ -989,6 +985,8 @@
989	985	iput(root);
990	986	goto err_put_conn;
991	987	}
	988	+ /* only now - we want root dentry with NULL ->d_op */
	989	+ sb->s_d_op = &fuse_dentry_operations;
992	990
993	991	init_req = fuse_request_alloc();
994	992	if (!init_req)