aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--fs/fuse/control.c2
-rw-r--r--fs/fuse/dir.c2
-rw-r--r--fs/fuse/file.c18
3 files changed, 11 insertions, 11 deletions
diff --git a/fs/fuse/control.c b/fs/fuse/control.c
index 16b39c053d47..8c58bd453993 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->i_private; 26 fc = file->f_path.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);
diff --git a/fs/fuse/dir.c b/fs/fuse/dir.c
index 1cabdb229adb..40080477ceb4 100644
--- a/fs/fuse/dir.c
+++ b/fs/fuse/dir.c
@@ -856,7 +856,7 @@ static int fuse_readdir(struct file *file, void *dstbuf, filldir_t filldir)
856 int err; 856 int err;
857 size_t nbytes; 857 size_t nbytes;
858 struct page *page; 858 struct page *page;
859 struct inode *inode = file->f_dentry->d_inode; 859 struct inode *inode = file->f_path.dentry->d_inode;
860 struct fuse_conn *fc = get_fuse_conn(inode); 860 struct fuse_conn *fc = get_fuse_conn(inode);
861 struct fuse_req *req; 861 struct fuse_req *req;
862 862
diff --git a/fs/fuse/file.c b/fs/fuse/file.c
index 128f79c40803..1387749201b3 100644
--- a/fs/fuse/file.c
+++ b/fs/fuse/file.c
@@ -141,8 +141,8 @@ int fuse_release_common(struct inode *inode, struct file *file, int isdir)
141 isdir ? FUSE_RELEASEDIR : FUSE_RELEASE); 141 isdir ? FUSE_RELEASEDIR : FUSE_RELEASE);
142 142
143 /* Hold vfsmount and dentry until release is finished */ 143 /* Hold vfsmount and dentry until release is finished */
144 req->vfsmount = mntget(file->f_vfsmnt); 144 req->vfsmount = mntget(file->f_path.mnt);
145 req->dentry = dget(file->f_dentry); 145 req->dentry = dget(file->f_path.dentry);
146 request_send_background(fc, req); 146 request_send_background(fc, req);
147 } 147 }
148 148
@@ -184,7 +184,7 @@ static u64 fuse_lock_owner_id(struct fuse_conn *fc, fl_owner_t id)
184 184
185static int fuse_flush(struct file *file, fl_owner_t id) 185static int fuse_flush(struct file *file, fl_owner_t id)
186{ 186{
187 struct inode *inode = file->f_dentry->d_inode; 187 struct inode *inode = file->f_path.dentry->d_inode;
188 struct fuse_conn *fc = get_fuse_conn(inode); 188 struct fuse_conn *fc = get_fuse_conn(inode);
189 struct fuse_file *ff = file->private_data; 189 struct fuse_file *ff = file->private_data;
190 struct fuse_req *req; 190 struct fuse_req *req;
@@ -533,7 +533,7 @@ static int fuse_get_user_pages(struct fuse_req *req, const char __user *buf,
533static ssize_t fuse_direct_io(struct file *file, const char __user *buf, 533static ssize_t fuse_direct_io(struct file *file, const char __user *buf,
534 size_t count, loff_t *ppos, int write) 534 size_t count, loff_t *ppos, int write)
535{ 535{
536 struct inode *inode = file->f_dentry->d_inode; 536 struct inode *inode = file->f_path.dentry->d_inode;
537 struct fuse_conn *fc = get_fuse_conn(inode); 537 struct fuse_conn *fc = get_fuse_conn(inode);
538 size_t nmax = write ? fc->max_write : fc->max_read; 538 size_t nmax = write ? fc->max_write : fc->max_read;
539 loff_t pos = *ppos; 539 loff_t pos = *ppos;
@@ -607,7 +607,7 @@ static ssize_t fuse_direct_read(struct file *file, char __user *buf,
607static ssize_t fuse_direct_write(struct file *file, const char __user *buf, 607static ssize_t fuse_direct_write(struct file *file, const char __user *buf,
608 size_t count, loff_t *ppos) 608 size_t count, loff_t *ppos)
609{ 609{
610 struct inode *inode = file->f_dentry->d_inode; 610 struct inode *inode = file->f_path.dentry->d_inode;
611 ssize_t res; 611 ssize_t res;
612 /* Don't allow parallel writes to the same file */ 612 /* Don't allow parallel writes to the same file */
613 mutex_lock(&inode->i_mutex); 613 mutex_lock(&inode->i_mutex);
@@ -662,7 +662,7 @@ static int convert_fuse_file_lock(const struct fuse_file_lock *ffl,
662static void fuse_lk_fill(struct fuse_req *req, struct file *file, 662static void fuse_lk_fill(struct fuse_req *req, struct file *file,
663 const struct file_lock *fl, int opcode, pid_t pid) 663 const struct file_lock *fl, int opcode, pid_t pid)
664{ 664{
665 struct inode *inode = file->f_dentry->d_inode; 665 struct inode *inode = file->f_path.dentry->d_inode;
666 struct fuse_conn *fc = get_fuse_conn(inode); 666 struct fuse_conn *fc = get_fuse_conn(inode);
667 struct fuse_file *ff = file->private_data; 667 struct fuse_file *ff = file->private_data;
668 struct fuse_lk_in *arg = &req->misc.lk_in; 668 struct fuse_lk_in *arg = &req->misc.lk_in;
@@ -682,7 +682,7 @@ static void fuse_lk_fill(struct fuse_req *req, struct file *file,
682 682
683static int fuse_getlk(struct file *file, struct file_lock *fl) 683static int fuse_getlk(struct file *file, struct file_lock *fl)
684{ 684{
685 struct inode *inode = file->f_dentry->d_inode; 685 struct inode *inode = file->f_path.dentry->d_inode;
686 struct fuse_conn *fc = get_fuse_conn(inode); 686 struct fuse_conn *fc = get_fuse_conn(inode);
687 struct fuse_req *req; 687 struct fuse_req *req;
688 struct fuse_lk_out outarg; 688 struct fuse_lk_out outarg;
@@ -707,7 +707,7 @@ static int fuse_getlk(struct file *file, struct file_lock *fl)
707 707
708static int fuse_setlk(struct file *file, struct file_lock *fl) 708static int fuse_setlk(struct file *file, struct file_lock *fl)
709{ 709{
710 struct inode *inode = file->f_dentry->d_inode; 710 struct inode *inode = file->f_path.dentry->d_inode;
711 struct fuse_conn *fc = get_fuse_conn(inode); 711 struct fuse_conn *fc = get_fuse_conn(inode);
712 struct fuse_req *req; 712 struct fuse_req *req;
713 int opcode = (fl->fl_flags & FL_SLEEP) ? FUSE_SETLKW : FUSE_SETLK; 713 int opcode = (fl->fl_flags & FL_SLEEP) ? FUSE_SETLKW : FUSE_SETLK;
@@ -734,7 +734,7 @@ static int fuse_setlk(struct file *file, struct file_lock *fl)
734 734
735static int fuse_file_lock(struct file *file, int cmd, struct file_lock *fl) 735static int fuse_file_lock(struct file *file, int cmd, struct file_lock *fl)
736{ 736{
737 struct inode *inode = file->f_dentry->d_inode; 737 struct inode *inode = file->f_path.dentry->d_inode;
738 struct fuse_conn *fc = get_fuse_conn(inode); 738 struct fuse_conn *fc = get_fuse_conn(inode);
739 int err; 739 int err;
740 740