Commit 0ce267ff authored by Miklos Szeredi's avatar Miklos Szeredi
Browse files

fuse: fix root dentry initialization

Add missing dentry initialization to root dentry.

Fixes: f75fdf22

 ("fuse: don't use ->d_time")
Reported-by: default avatarAndreas Reis <andreas.reis@gmail.com>
Signed-off-by: default avatarMiklos Szeredi <mszeredi@redhat.com>
parent 1001354c
...@@ -286,6 +286,11 @@ const struct dentry_operations fuse_dentry_operations = { ...@@ -286,6 +286,11 @@ const struct dentry_operations fuse_dentry_operations = {
.d_release = fuse_dentry_release, .d_release = fuse_dentry_release,
}; };
const struct dentry_operations fuse_root_dentry_operations = {
.d_init = fuse_dentry_init,
.d_release = fuse_dentry_release,
};
int fuse_valid_type(int m) int fuse_valid_type(int m)
{ {
return S_ISREG(m) || S_ISDIR(m) || S_ISLNK(m) || S_ISCHR(m) || return S_ISREG(m) || S_ISDIR(m) || S_ISLNK(m) || S_ISCHR(m) ||
......
...@@ -692,6 +692,7 @@ static inline u64 get_node_id(struct inode *inode) ...@@ -692,6 +692,7 @@ static inline u64 get_node_id(struct inode *inode)
extern const struct file_operations fuse_dev_operations; extern const struct file_operations fuse_dev_operations;
extern const struct dentry_operations fuse_dentry_operations; extern const struct dentry_operations fuse_dentry_operations;
extern const struct dentry_operations fuse_root_dentry_operations;
/** /**
* Inode to nodeid comparison. * Inode to nodeid comparison.
......
...@@ -1131,10 +1131,11 @@ static int fuse_fill_super(struct super_block *sb, void *data, int silent) ...@@ -1131,10 +1131,11 @@ static int fuse_fill_super(struct super_block *sb, void *data, int silent)
err = -ENOMEM; err = -ENOMEM;
root = fuse_get_root_inode(sb, d.rootmode); root = fuse_get_root_inode(sb, d.rootmode);
sb->s_d_op = &fuse_root_dentry_operations;
root_dentry = d_make_root(root); root_dentry = d_make_root(root);
if (!root_dentry) if (!root_dentry)
goto err_dev_free; goto err_dev_free;
/* only now - we want root dentry with NULL ->d_op */ /* Root dentry doesn't have .d_revalidate */
sb->s_d_op = &fuse_dentry_operations; sb->s_d_op = &fuse_dentry_operations;
init_req = fuse_request_alloc(0); init_req = fuse_request_alloc(0);
......
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