diff options
Diffstat (limited to 'fs/ceph/dir.c')
-rw-r--r-- | fs/ceph/dir.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/fs/ceph/dir.c b/fs/ceph/dir.c index 4fd30900eff7..f85719310db2 100644 --- a/fs/ceph/dir.c +++ b/fs/ceph/dir.c | |||
@@ -587,7 +587,7 @@ static struct dentry *ceph_lookup(struct inode *dir, struct dentry *dentry, | |||
587 | CEPH_MDS_OP_LOOKUPSNAP : CEPH_MDS_OP_LOOKUP; | 587 | CEPH_MDS_OP_LOOKUPSNAP : CEPH_MDS_OP_LOOKUP; |
588 | req = ceph_mdsc_create_request(mdsc, op, USE_ANY_MDS); | 588 | req = ceph_mdsc_create_request(mdsc, op, USE_ANY_MDS); |
589 | if (IS_ERR(req)) | 589 | if (IS_ERR(req)) |
590 | return ERR_PTR(PTR_ERR(req)); | 590 | return ERR_CAST(req); |
591 | req->r_dentry = dget(dentry); | 591 | req->r_dentry = dget(dentry); |
592 | req->r_num_caps = 2; | 592 | req->r_num_caps = 2; |
593 | /* we only need inode linkage */ | 593 | /* we only need inode linkage */ |
@@ -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; |