aboutsummaryrefslogtreecommitdiffstats
path: root/fs/fuse
diff options
context:
space:
mode:
Diffstat (limited to 'fs/fuse')
-rw-r--r--fs/fuse/file.c2
-rw-r--r--fs/fuse/inode.c11
2 files changed, 7 insertions, 6 deletions
diff --git a/fs/fuse/file.c b/fs/fuse/file.c
index fc342cf7c2cc..087f3b734f40 100644
--- a/fs/fuse/file.c
+++ b/fs/fuse/file.c
@@ -169,7 +169,7 @@ static int fuse_release(struct inode *inode, struct file *file)
169 return fuse_release_common(inode, file, 0); 169 return fuse_release_common(inode, file, 0);
170} 170}
171 171
172static int fuse_flush(struct file *file) 172static int fuse_flush(struct file *file, fl_owner_t id)
173{ 173{
174 struct inode *inode = file->f_dentry->d_inode; 174 struct inode *inode = file->f_dentry->d_inode;
175 struct fuse_conn *fc = get_fuse_conn(inode); 175 struct fuse_conn *fc = get_fuse_conn(inode);
diff --git a/fs/fuse/inode.c b/fs/fuse/inode.c
index 13ebe5780c93..815c824f4fc8 100644
--- a/fs/fuse/inode.c
+++ b/fs/fuse/inode.c
@@ -237,8 +237,9 @@ static void convert_fuse_statfs(struct kstatfs *stbuf, struct fuse_kstatfs *attr
237 /* fsid is left zero */ 237 /* fsid is left zero */
238} 238}
239 239
240static int fuse_statfs(struct super_block *sb, struct kstatfs *buf) 240static int fuse_statfs(struct dentry *dentry, struct kstatfs *buf)
241{ 241{
242 struct super_block *sb = dentry->d_sb;
242 struct fuse_conn *fc = get_fuse_conn_super(sb); 243 struct fuse_conn *fc = get_fuse_conn_super(sb);
243 struct fuse_req *req; 244 struct fuse_req *req;
244 struct fuse_statfs_out outarg; 245 struct fuse_statfs_out outarg;
@@ -570,11 +571,11 @@ static int fuse_fill_super(struct super_block *sb, void *data, int silent)
570 return err; 571 return err;
571} 572}
572 573
573static struct super_block *fuse_get_sb(struct file_system_type *fs_type, 574static int fuse_get_sb(struct file_system_type *fs_type,
574 int flags, const char *dev_name, 575 int flags, const char *dev_name,
575 void *raw_data) 576 void *raw_data, struct vfsmount *mnt)
576{ 577{
577 return get_sb_nodev(fs_type, flags, raw_data, fuse_fill_super); 578 return get_sb_nodev(fs_type, flags, raw_data, fuse_fill_super, mnt);
578} 579}
579 580
580static struct file_system_type fuse_fs_type = { 581static struct file_system_type fuse_fs_type = {