Commit c35eebe9 authored by Al Viro's avatar Al Viro

switch fuse

Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent d93e34fa
...@@ -350,7 +350,6 @@ static struct dentry *fuse_lookup(struct inode *dir, struct dentry *entry, ...@@ -350,7 +350,6 @@ static struct dentry *fuse_lookup(struct inode *dir, struct dentry *entry,
} }
entry = newent ? newent : entry; entry = newent ? newent : entry;
d_set_d_op(entry, &fuse_dentry_operations);
if (outarg_valid) if (outarg_valid)
fuse_change_entry_timeout(entry, &outarg); fuse_change_entry_timeout(entry, &outarg);
else else
......
...@@ -617,10 +617,8 @@ static struct dentry *fuse_get_dentry(struct super_block *sb, ...@@ -617,10 +617,8 @@ static struct dentry *fuse_get_dentry(struct super_block *sb,
goto out_iput; goto out_iput;
entry = d_obtain_alias(inode); entry = d_obtain_alias(inode);
if (!IS_ERR(entry) && get_node_id(inode) != FUSE_ROOT_ID) { if (!IS_ERR(entry) && get_node_id(inode) != FUSE_ROOT_ID)
d_set_d_op(entry, &fuse_dentry_operations);
fuse_invalidate_entry_cache(entry); fuse_invalidate_entry_cache(entry);
}
return entry; return entry;
...@@ -719,10 +717,8 @@ static struct dentry *fuse_get_parent(struct dentry *child) ...@@ -719,10 +717,8 @@ static struct dentry *fuse_get_parent(struct dentry *child)
} }
parent = d_obtain_alias(inode); parent = d_obtain_alias(inode);
if (!IS_ERR(parent) && get_node_id(inode) != FUSE_ROOT_ID) { if (!IS_ERR(parent) && get_node_id(inode) != FUSE_ROOT_ID)
d_set_d_op(parent, &fuse_dentry_operations);
fuse_invalidate_entry_cache(parent); fuse_invalidate_entry_cache(parent);
}
return parent; return parent;
} }
...@@ -989,6 +985,8 @@ static int fuse_fill_super(struct super_block *sb, void *data, int silent) ...@@ -989,6 +985,8 @@ static int fuse_fill_super(struct super_block *sb, void *data, int silent)
iput(root); iput(root);
goto err_put_conn; 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(); init_req = fuse_request_alloc();
if (!init_req) if (!init_req)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment