diff options
Diffstat (limited to 'fs/ceph')
-rw-r--r-- | fs/ceph/caps.c | 4 | ||||
-rw-r--r-- | fs/ceph/dir.c | 5 | ||||
-rw-r--r-- | fs/ceph/super.h | 2 |
3 files changed, 5 insertions, 6 deletions
diff --git a/fs/ceph/caps.c b/fs/ceph/caps.c index 0dd0b81e64f7..ae3e3a306445 100644 --- a/fs/ceph/caps.c +++ b/fs/ceph/caps.c | |||
@@ -1776,9 +1776,9 @@ out: | |||
1776 | spin_unlock(&ci->i_unsafe_lock); | 1776 | spin_unlock(&ci->i_unsafe_lock); |
1777 | } | 1777 | } |
1778 | 1778 | ||
1779 | int ceph_fsync(struct file *file, struct dentry *dentry, int datasync) | 1779 | int ceph_fsync(struct file *file, int datasync) |
1780 | { | 1780 | { |
1781 | struct inode *inode = dentry->d_inode; | 1781 | struct inode *inode = file->f_mapping->host; |
1782 | struct ceph_inode_info *ci = ceph_inode(inode); | 1782 | struct ceph_inode_info *ci = ceph_inode(inode); |
1783 | unsigned flush_tid; | 1783 | unsigned flush_tid; |
1784 | int ret; | 1784 | int ret; |
diff --git a/fs/ceph/dir.c b/fs/ceph/dir.c index 4fd30900eff7..0057f4a07347 100644 --- a/fs/ceph/dir.c +++ b/fs/ceph/dir.c | |||
@@ -1107,10 +1107,9 @@ static ssize_t ceph_read_dir(struct file *file, char __user *buf, size_t size, | |||
1107 | * an fsync() on a dir will wait for any uncommitted directory | 1107 | * an fsync() on a dir will wait for any uncommitted directory |
1108 | * operations to commit. | 1108 | * operations to commit. |
1109 | */ | 1109 | */ |
1110 | static int ceph_dir_fsync(struct file *file, struct dentry *dentry, | 1110 | static int ceph_dir_fsync(struct file *file, int datasync) |
1111 | int datasync) | ||
1112 | { | 1111 | { |
1113 | struct inode *inode = dentry->d_inode; | 1112 | struct inode *inode = file->f_path.dentry->d_inode; |
1114 | struct ceph_inode_info *ci = ceph_inode(inode); | 1113 | struct ceph_inode_info *ci = ceph_inode(inode); |
1115 | struct list_head *head = &ci->i_unsafe_dirops; | 1114 | struct list_head *head = &ci->i_unsafe_dirops; |
1116 | struct ceph_mds_request *req; | 1115 | struct ceph_mds_request *req; |
diff --git a/fs/ceph/super.h b/fs/ceph/super.h index 3725c9ee9d08..dd1e7add656b 100644 --- a/fs/ceph/super.h +++ b/fs/ceph/super.h | |||
@@ -811,7 +811,7 @@ extern void ceph_put_cap(struct ceph_cap *cap); | |||
811 | 811 | ||
812 | extern void ceph_queue_caps_release(struct inode *inode); | 812 | extern void ceph_queue_caps_release(struct inode *inode); |
813 | extern int ceph_write_inode(struct inode *inode, struct writeback_control *wbc); | 813 | extern int ceph_write_inode(struct inode *inode, struct writeback_control *wbc); |
814 | extern int ceph_fsync(struct file *file, struct dentry *dentry, int datasync); | 814 | extern int ceph_fsync(struct file *file, int datasync); |
815 | extern void ceph_kick_flushing_caps(struct ceph_mds_client *mdsc, | 815 | extern void ceph_kick_flushing_caps(struct ceph_mds_client *mdsc, |
816 | struct ceph_mds_session *session); | 816 | struct ceph_mds_session *session); |
817 | extern int ceph_get_cap_mds(struct inode *inode); | 817 | extern int ceph_get_cap_mds(struct inode *inode); |