diff options
Diffstat (limited to 'fs/fuse/control.c')
-rw-r--r-- | fs/fuse/control.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/fuse/control.c b/fs/fuse/control.c index 46fe60b2da23..79ec1f23d4d2 100644 --- a/fs/fuse/control.c +++ b/fs/fuse/control.c | |||
@@ -23,7 +23,7 @@ static struct fuse_conn *fuse_ctl_file_conn_get(struct file *file) | |||
23 | { | 23 | { |
24 | struct fuse_conn *fc; | 24 | struct fuse_conn *fc; |
25 | mutex_lock(&fuse_mutex); | 25 | mutex_lock(&fuse_mutex); |
26 | fc = file->f_dentry->d_inode->u.generic_ip; | 26 | fc = file->f_dentry->d_inode->i_private; |
27 | if (fc) | 27 | if (fc) |
28 | fc = fuse_conn_get(fc); | 28 | fc = fuse_conn_get(fc); |
29 | mutex_unlock(&fuse_mutex); | 29 | mutex_unlock(&fuse_mutex); |
@@ -98,7 +98,7 @@ static struct dentry *fuse_ctl_add_dentry(struct dentry *parent, | |||
98 | inode->i_op = iop; | 98 | inode->i_op = iop; |
99 | inode->i_fop = fop; | 99 | inode->i_fop = fop; |
100 | inode->i_nlink = nlink; | 100 | inode->i_nlink = nlink; |
101 | inode->u.generic_ip = fc; | 101 | inode->i_private = fc; |
102 | d_add(dentry, inode); | 102 | d_add(dentry, inode); |
103 | return dentry; | 103 | return dentry; |
104 | } | 104 | } |
@@ -150,7 +150,7 @@ void fuse_ctl_remove_conn(struct fuse_conn *fc) | |||
150 | 150 | ||
151 | for (i = fc->ctl_ndents - 1; i >= 0; i--) { | 151 | for (i = fc->ctl_ndents - 1; i >= 0; i--) { |
152 | struct dentry *dentry = fc->ctl_dentry[i]; | 152 | struct dentry *dentry = fc->ctl_dentry[i]; |
153 | dentry->d_inode->u.generic_ip = NULL; | 153 | dentry->d_inode->i_private = NULL; |
154 | d_drop(dentry); | 154 | d_drop(dentry); |
155 | dput(dentry); | 155 | dput(dentry); |
156 | } | 156 | } |