| Message ID | 20190606134754.31725-1-zyan@redhat.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [1/3] ceph: pass filp to ceph_get_caps() | expand |
On Thu, 2019-06-06 at 21:47 +0800, Yan, Zheng wrote: > This is preparetion for checking filp error. > > Signed-off-by: "Yan, Zheng" <zyan@redhat.com> > --- > fs/ceph/addr.c | 15 +++++++++------ > fs/ceph/caps.c | 32 +++++++++++++++++--------------- > fs/ceph/file.c | 35 +++++++++++++++++------------------ > fs/ceph/super.h | 6 +++--- > 4 files changed, 46 insertions(+), 42 deletions(-) > Thanks Zheng, I'll look over this in the near future. This is complex material and I worry that I don't have a fully clear picture of what this work is intended to do. I think a set like this deserves a good cover letter. While I do have some idea of what you're trying to do here, I think we'd all really benefit from a clear description of the problem you're solving and how this will help it. Thanks, Jeff > diff --git a/fs/ceph/addr.c b/fs/ceph/addr.c > index a47c541f8006..4d39fd4c1dd6 100644 > --- a/fs/ceph/addr.c > +++ b/fs/ceph/addr.c > @@ -322,7 +322,8 @@ static int start_read(struct inode *inode, struct ceph_rw_context *rw_ctx, > /* caller of readpages does not hold buffer and read caps > * (fadvise, madvise and readahead cases) */ > int want = CEPH_CAP_FILE_CACHE; > - ret = ceph_try_get_caps(ci, CEPH_CAP_FILE_RD, want, true, &got); > + ret = ceph_try_get_caps(inode, CEPH_CAP_FILE_RD, want, > + true, &got); > if (ret < 0) { > dout("start_read %p, error getting cap\n", inode); > } else if (!(got & want)) { > @@ -1450,7 +1451,8 @@ static vm_fault_t ceph_filemap_fault(struct vm_fault *vmf) > want = CEPH_CAP_FILE_CACHE; > > got = 0; > - err = ceph_get_caps(ci, CEPH_CAP_FILE_RD, want, -1, &got, &pinned_page); > + err = ceph_get_caps(vma->vm_file, CEPH_CAP_FILE_RD, want, -1, > + &got, &pinned_page); > if (err < 0) > goto out_restore; > > @@ -1566,7 +1568,7 @@ static vm_fault_t ceph_page_mkwrite(struct vm_fault *vmf) > want = CEPH_CAP_FILE_BUFFER; > > got = 0; > - err = ceph_get_caps(ci, CEPH_CAP_FILE_WR, want, off + len, > + err = ceph_get_caps(vma->vm_file, CEPH_CAP_FILE_WR, want, off + len, > &got, NULL); > if (err < 0) > goto out_free; > @@ -1986,10 +1988,11 @@ static int __ceph_pool_perm_get(struct ceph_inode_info *ci, > return err; > } > > -int ceph_pool_perm_check(struct ceph_inode_info *ci, int need) > +int ceph_pool_perm_check(struct inode *inode, int need) > { > - s64 pool; > + struct ceph_inode_info *ci = ceph_inode(inode); > struct ceph_string *pool_ns; > + s64 pool; > int ret, flags; > > if (ci->i_vino.snap != CEPH_NOSNAP) { > @@ -2001,7 +2004,7 @@ int ceph_pool_perm_check(struct ceph_inode_info *ci, int need) > return 0; > } > > - if (ceph_test_mount_opt(ceph_inode_to_client(&ci->vfs_inode), > + if (ceph_test_mount_opt(ceph_inode_to_client(inode), > NOPOOLPERM)) > return 0; > > diff --git a/fs/ceph/caps.c b/fs/ceph/caps.c > index fd9ab97c7f4e..e88a21d830e1 100644 > --- a/fs/ceph/caps.c > +++ b/fs/ceph/caps.c > @@ -2545,10 +2545,10 @@ static void __take_cap_refs(struct ceph_inode_info *ci, int got, > * > * FIXME: how does a 0 return differ from -EAGAIN? > */ > -static int try_get_cap_refs(struct ceph_inode_info *ci, int need, int want, > +static int try_get_cap_refs(struct inode *inode, int need, int want, > loff_t endoff, bool nonblock, int *got) > { > - struct inode *inode = &ci->vfs_inode; > + struct ceph_inode_info *ci = ceph_inode(inode); > struct ceph_mds_client *mdsc = ceph_inode_to_client(inode)->mdsc; > int ret = 0; > int have, implemented; > @@ -2716,18 +2716,18 @@ static void check_max_size(struct inode *inode, loff_t endoff) > ceph_check_caps(ci, CHECK_CAPS_AUTHONLY, NULL); > } > > -int ceph_try_get_caps(struct ceph_inode_info *ci, int need, int want, > +int ceph_try_get_caps(struct inode *inode, int need, int want, > bool nonblock, int *got) > { > int ret; > > BUG_ON(need & ~CEPH_CAP_FILE_RD); > BUG_ON(want & ~(CEPH_CAP_FILE_CACHE|CEPH_CAP_FILE_LAZYIO|CEPH_CAP_FILE_SHARED)); > - ret = ceph_pool_perm_check(ci, need); > + ret = ceph_pool_perm_check(inode, need); > if (ret < 0) > return ret; > > - ret = try_get_cap_refs(ci, need, want, 0, nonblock, got); > + ret = try_get_cap_refs(inode, need, want, 0, nonblock, got); > return ret == -EAGAIN ? 0 : ret; > } > > @@ -2736,21 +2736,23 @@ int ceph_try_get_caps(struct ceph_inode_info *ci, int need, int want, > * due to a small max_size, make sure we check_max_size (and possibly > * ask the mds) so we don't get hung up indefinitely. > */ > -int ceph_get_caps(struct ceph_inode_info *ci, int need, int want, > +int ceph_get_caps(struct file *filp, int need, int want, > loff_t endoff, int *got, struct page **pinned_page) > { > + struct inode *inode = file_inode(filp); > + struct ceph_inode_info *ci = ceph_inode(inode); > int _got, ret; > > - ret = ceph_pool_perm_check(ci, need); > + ret = ceph_pool_perm_check(inode, need); > if (ret < 0) > return ret; > > while (true) { > if (endoff > 0) > - check_max_size(&ci->vfs_inode, endoff); > + check_max_size(inode, endoff); > > _got = 0; > - ret = try_get_cap_refs(ci, need, want, endoff, > + ret = try_get_cap_refs(inode, need, want, endoff, > false, &_got); > if (ret == -EAGAIN) > continue; > @@ -2758,8 +2760,8 @@ int ceph_get_caps(struct ceph_inode_info *ci, int need, int want, > DEFINE_WAIT_FUNC(wait, woken_wake_function); > add_wait_queue(&ci->i_cap_wq, &wait); > > - while (!(ret = try_get_cap_refs(ci, need, want, endoff, > - true, &_got))) { > + while (!(ret = try_get_cap_refs(inode, need, want, > + endoff, true, &_got))) { > if (signal_pending(current)) { > ret = -ERESTARTSYS; > break; > @@ -2774,7 +2776,7 @@ int ceph_get_caps(struct ceph_inode_info *ci, int need, int want, > if (ret < 0) { > if (ret == -ESTALE) { > /* session was killed, try renew caps */ > - ret = ceph_renew_caps(&ci->vfs_inode); > + ret = ceph_renew_caps(inode); > if (ret == 0) > continue; > } > @@ -2783,9 +2785,9 @@ int ceph_get_caps(struct ceph_inode_info *ci, int need, int want, > > if (ci->i_inline_version != CEPH_INLINE_NONE && > (_got & (CEPH_CAP_FILE_CACHE|CEPH_CAP_FILE_LAZYIO)) && > - i_size_read(&ci->vfs_inode) > 0) { > + i_size_read(inode) > 0) { > struct page *page = > - find_get_page(ci->vfs_inode.i_mapping, 0); > + find_get_page(inode->i_mapping, 0); > if (page) { > if (PageUptodate(page)) { > *pinned_page = page; > @@ -2804,7 +2806,7 @@ int ceph_get_caps(struct ceph_inode_info *ci, int need, int want, > * getattr request will bring inline data into > * page cache > */ > - ret = __ceph_do_getattr(&ci->vfs_inode, NULL, > + ret = __ceph_do_getattr(inode, NULL, > CEPH_STAT_CAP_INLINE_DATA, > true); > if (ret < 0) > diff --git a/fs/ceph/file.c b/fs/ceph/file.c > index 2fe8ca7805f4..300cbaf09aa1 100644 > --- a/fs/ceph/file.c > +++ b/fs/ceph/file.c > @@ -1260,7 +1260,8 @@ static ssize_t ceph_read_iter(struct kiocb *iocb, struct iov_iter *to) > want = CEPH_CAP_FILE_CACHE | CEPH_CAP_FILE_LAZYIO; > else > want = CEPH_CAP_FILE_CACHE; > - ret = ceph_get_caps(ci, CEPH_CAP_FILE_RD, want, -1, &got, &pinned_page); > + ret = ceph_get_caps(filp, CEPH_CAP_FILE_RD, want, -1, > + &got, &pinned_page); > if (ret < 0) > return ret; > > @@ -1455,7 +1456,7 @@ static ssize_t ceph_write_iter(struct kiocb *iocb, struct iov_iter *from) > else > want = CEPH_CAP_FILE_BUFFER; > got = 0; > - err = ceph_get_caps(ci, CEPH_CAP_FILE_WR, want, pos + count, > + err = ceph_get_caps(file, CEPH_CAP_FILE_WR, want, pos + count, > &got, NULL); > if (err < 0) > goto out; > @@ -1779,7 +1780,7 @@ static long ceph_fallocate(struct file *file, int mode, > else > want = CEPH_CAP_FILE_BUFFER; > > - ret = ceph_get_caps(ci, CEPH_CAP_FILE_WR, want, endoff, &got, NULL); > + ret = ceph_get_caps(file, CEPH_CAP_FILE_WR, want, endoff, &got, NULL); > if (ret < 0) > goto unlock; > > @@ -1808,16 +1809,15 @@ static long ceph_fallocate(struct file *file, int mode, > * src_ci. Two attempts are made to obtain both caps, and an error is return if > * this fails; zero is returned on success. > */ > -static int get_rd_wr_caps(struct ceph_inode_info *src_ci, > - loff_t src_endoff, int *src_got, > - struct ceph_inode_info *dst_ci, > +static int get_rd_wr_caps(struct file *src_filp, int *src_got, > + struct file *dst_filp, > loff_t dst_endoff, int *dst_got) > { > int ret = 0; > bool retrying = false; > > retry_caps: > - ret = ceph_get_caps(dst_ci, CEPH_CAP_FILE_WR, CEPH_CAP_FILE_BUFFER, > + ret = ceph_get_caps(dst_filp, CEPH_CAP_FILE_WR, CEPH_CAP_FILE_BUFFER, > dst_endoff, dst_got, NULL); > if (ret < 0) > return ret; > @@ -1827,24 +1827,24 @@ static int get_rd_wr_caps(struct ceph_inode_info *src_ci, > * we would risk a deadlock by using ceph_get_caps. Thus, we'll do some > * retry dance instead to try to get both capabilities. > */ > - ret = ceph_try_get_caps(src_ci, CEPH_CAP_FILE_RD, CEPH_CAP_FILE_SHARED, > + ret = ceph_try_get_caps(file_inode(src_filp), > + CEPH_CAP_FILE_RD, CEPH_CAP_FILE_SHARED, > false, src_got); > if (ret <= 0) { > /* Start by dropping dst_ci caps and getting src_ci caps */ > - ceph_put_cap_refs(dst_ci, *dst_got); > + ceph_put_cap_refs(ceph_inode(file_inode(dst_filp)), *dst_got); > if (retrying) { > if (!ret) > /* ceph_try_get_caps masks EAGAIN */ > ret = -EAGAIN; > return ret; > } > - ret = ceph_get_caps(src_ci, CEPH_CAP_FILE_RD, > - CEPH_CAP_FILE_SHARED, src_endoff, > - src_got, NULL); > + ret = ceph_get_caps(src_filp, CEPH_CAP_FILE_RD, > + CEPH_CAP_FILE_SHARED, -1, src_got, NULL); > if (ret < 0) > return ret; > /*... drop src_ci caps too, and retry */ > - ceph_put_cap_refs(src_ci, *src_got); > + ceph_put_cap_refs(ceph_inode(file_inode(src_filp)), *src_got); > retrying = true; > goto retry_caps; > } > @@ -1958,8 +1958,8 @@ static ssize_t ceph_copy_file_range(struct file *src_file, loff_t src_off, > * clients may have dirty data in their caches. And OSDs know nothing > * about caps, so they can't safely do the remote object copies. > */ > - err = get_rd_wr_caps(src_ci, (src_off + len), &src_got, > - dst_ci, (dst_off + len), &dst_got); > + err = get_rd_wr_caps(src_file, &src_got, > + dst_file, (dst_off + len), &dst_got); > if (err < 0) { > dout("get_rd_wr_caps returned %d\n", err); > ret = -EOPNOTSUPP; > @@ -2016,9 +2016,8 @@ static ssize_t ceph_copy_file_range(struct file *src_file, loff_t src_off, > goto out; > } > len -= ret; > - err = get_rd_wr_caps(src_ci, (src_off + len), > - &src_got, dst_ci, > - (dst_off + len), &dst_got); > + err = get_rd_wr_caps(src_file, &src_got, > + dst_file, (dst_off + len), &dst_got); > if (err < 0) > goto out; > err = is_file_size_ok(src_inode, dst_inode, > diff --git a/fs/ceph/super.h b/fs/ceph/super.h > index 2e516d47052f..f45a06475f4f 100644 > --- a/fs/ceph/super.h > +++ b/fs/ceph/super.h > @@ -1061,9 +1061,9 @@ extern int ceph_encode_dentry_release(void **p, struct dentry *dn, > struct inode *dir, > int mds, int drop, int unless); > > -extern int ceph_get_caps(struct ceph_inode_info *ci, int need, int want, > +extern int ceph_get_caps(struct file *filp, int need, int want, > loff_t endoff, int *got, struct page **pinned_page); > -extern int ceph_try_get_caps(struct ceph_inode_info *ci, > +extern int ceph_try_get_caps(struct inode *inode, > int need, int want, bool nonblock, int *got); > > /* for counting open files by mode */ > @@ -1074,7 +1074,7 @@ extern void ceph_put_fmode(struct ceph_inode_info *ci, int mode); > extern const struct address_space_operations ceph_aops; > extern int ceph_mmap(struct file *file, struct vm_area_struct *vma); > extern int ceph_uninline_data(struct file *filp, struct page *locked_page); > -extern int ceph_pool_perm_check(struct ceph_inode_info *ci, int need); > +extern int ceph_pool_perm_check(struct inode *inode, int need); > extern void ceph_pool_perm_destroy(struct ceph_mds_client* mdsc); > > /* file.c */
diff --git a/fs/ceph/addr.c b/fs/ceph/addr.c index a47c541f8006..4d39fd4c1dd6 100644 --- a/fs/ceph/addr.c +++ b/fs/ceph/addr.c @@ -322,7 +322,8 @@ static int start_read(struct inode *inode, struct ceph_rw_context *rw_ctx, /* caller of readpages does not hold buffer and read caps * (fadvise, madvise and readahead cases) */ int want = CEPH_CAP_FILE_CACHE; - ret = ceph_try_get_caps(ci, CEPH_CAP_FILE_RD, want, true, &got); + ret = ceph_try_get_caps(inode, CEPH_CAP_FILE_RD, want, + true, &got); if (ret < 0) { dout("start_read %p, error getting cap\n", inode); } else if (!(got & want)) { @@ -1450,7 +1451,8 @@ static vm_fault_t ceph_filemap_fault(struct vm_fault *vmf) want = CEPH_CAP_FILE_CACHE; got = 0; - err = ceph_get_caps(ci, CEPH_CAP_FILE_RD, want, -1, &got, &pinned_page); + err = ceph_get_caps(vma->vm_file, CEPH_CAP_FILE_RD, want, -1, + &got, &pinned_page); if (err < 0) goto out_restore; @@ -1566,7 +1568,7 @@ static vm_fault_t ceph_page_mkwrite(struct vm_fault *vmf) want = CEPH_CAP_FILE_BUFFER; got = 0; - err = ceph_get_caps(ci, CEPH_CAP_FILE_WR, want, off + len, + err = ceph_get_caps(vma->vm_file, CEPH_CAP_FILE_WR, want, off + len, &got, NULL); if (err < 0) goto out_free; @@ -1986,10 +1988,11 @@ static int __ceph_pool_perm_get(struct ceph_inode_info *ci, return err; } -int ceph_pool_perm_check(struct ceph_inode_info *ci, int need) +int ceph_pool_perm_check(struct inode *inode, int need) { - s64 pool; + struct ceph_inode_info *ci = ceph_inode(inode); struct ceph_string *pool_ns; + s64 pool; int ret, flags; if (ci->i_vino.snap != CEPH_NOSNAP) { @@ -2001,7 +2004,7 @@ int ceph_pool_perm_check(struct ceph_inode_info *ci, int need) return 0; } - if (ceph_test_mount_opt(ceph_inode_to_client(&ci->vfs_inode), + if (ceph_test_mount_opt(ceph_inode_to_client(inode), NOPOOLPERM)) return 0; diff --git a/fs/ceph/caps.c b/fs/ceph/caps.c index fd9ab97c7f4e..e88a21d830e1 100644 --- a/fs/ceph/caps.c +++ b/fs/ceph/caps.c @@ -2545,10 +2545,10 @@ static void __take_cap_refs(struct ceph_inode_info *ci, int got, * * FIXME: how does a 0 return differ from -EAGAIN? */ -static int try_get_cap_refs(struct ceph_inode_info *ci, int need, int want, +static int try_get_cap_refs(struct inode *inode, int need, int want, loff_t endoff, bool nonblock, int *got) { - struct inode *inode = &ci->vfs_inode; + struct ceph_inode_info *ci = ceph_inode(inode); struct ceph_mds_client *mdsc = ceph_inode_to_client(inode)->mdsc; int ret = 0; int have, implemented; @@ -2716,18 +2716,18 @@ static void check_max_size(struct inode *inode, loff_t endoff) ceph_check_caps(ci, CHECK_CAPS_AUTHONLY, NULL); } -int ceph_try_get_caps(struct ceph_inode_info *ci, int need, int want, +int ceph_try_get_caps(struct inode *inode, int need, int want, bool nonblock, int *got) { int ret; BUG_ON(need & ~CEPH_CAP_FILE_RD); BUG_ON(want & ~(CEPH_CAP_FILE_CACHE|CEPH_CAP_FILE_LAZYIO|CEPH_CAP_FILE_SHARED)); - ret = ceph_pool_perm_check(ci, need); + ret = ceph_pool_perm_check(inode, need); if (ret < 0) return ret; - ret = try_get_cap_refs(ci, need, want, 0, nonblock, got); + ret = try_get_cap_refs(inode, need, want, 0, nonblock, got); return ret == -EAGAIN ? 0 : ret; } @@ -2736,21 +2736,23 @@ int ceph_try_get_caps(struct ceph_inode_info *ci, int need, int want, * due to a small max_size, make sure we check_max_size (and possibly * ask the mds) so we don't get hung up indefinitely. */ -int ceph_get_caps(struct ceph_inode_info *ci, int need, int want, +int ceph_get_caps(struct file *filp, int need, int want, loff_t endoff, int *got, struct page **pinned_page) { + struct inode *inode = file_inode(filp); + struct ceph_inode_info *ci = ceph_inode(inode); int _got, ret; - ret = ceph_pool_perm_check(ci, need); + ret = ceph_pool_perm_check(inode, need); if (ret < 0) return ret; while (true) { if (endoff > 0) - check_max_size(&ci->vfs_inode, endoff); + check_max_size(inode, endoff); _got = 0; - ret = try_get_cap_refs(ci, need, want, endoff, + ret = try_get_cap_refs(inode, need, want, endoff, false, &_got); if (ret == -EAGAIN) continue; @@ -2758,8 +2760,8 @@ int ceph_get_caps(struct ceph_inode_info *ci, int need, int want, DEFINE_WAIT_FUNC(wait, woken_wake_function); add_wait_queue(&ci->i_cap_wq, &wait); - while (!(ret = try_get_cap_refs(ci, need, want, endoff, - true, &_got))) { + while (!(ret = try_get_cap_refs(inode, need, want, + endoff, true, &_got))) { if (signal_pending(current)) { ret = -ERESTARTSYS; break; @@ -2774,7 +2776,7 @@ int ceph_get_caps(struct ceph_inode_info *ci, int need, int want, if (ret < 0) { if (ret == -ESTALE) { /* session was killed, try renew caps */ - ret = ceph_renew_caps(&ci->vfs_inode); + ret = ceph_renew_caps(inode); if (ret == 0) continue; } @@ -2783,9 +2785,9 @@ int ceph_get_caps(struct ceph_inode_info *ci, int need, int want, if (ci->i_inline_version != CEPH_INLINE_NONE && (_got & (CEPH_CAP_FILE_CACHE|CEPH_CAP_FILE_LAZYIO)) && - i_size_read(&ci->vfs_inode) > 0) { + i_size_read(inode) > 0) { struct page *page = - find_get_page(ci->vfs_inode.i_mapping, 0); + find_get_page(inode->i_mapping, 0); if (page) { if (PageUptodate(page)) { *pinned_page = page; @@ -2804,7 +2806,7 @@ int ceph_get_caps(struct ceph_inode_info *ci, int need, int want, * getattr request will bring inline data into * page cache */ - ret = __ceph_do_getattr(&ci->vfs_inode, NULL, + ret = __ceph_do_getattr(inode, NULL, CEPH_STAT_CAP_INLINE_DATA, true); if (ret < 0) diff --git a/fs/ceph/file.c b/fs/ceph/file.c index 2fe8ca7805f4..300cbaf09aa1 100644 --- a/fs/ceph/file.c +++ b/fs/ceph/file.c @@ -1260,7 +1260,8 @@ static ssize_t ceph_read_iter(struct kiocb *iocb, struct iov_iter *to) want = CEPH_CAP_FILE_CACHE | CEPH_CAP_FILE_LAZYIO; else want = CEPH_CAP_FILE_CACHE; - ret = ceph_get_caps(ci, CEPH_CAP_FILE_RD, want, -1, &got, &pinned_page); + ret = ceph_get_caps(filp, CEPH_CAP_FILE_RD, want, -1, + &got, &pinned_page); if (ret < 0) return ret; @@ -1455,7 +1456,7 @@ static ssize_t ceph_write_iter(struct kiocb *iocb, struct iov_iter *from) else want = CEPH_CAP_FILE_BUFFER; got = 0; - err = ceph_get_caps(ci, CEPH_CAP_FILE_WR, want, pos + count, + err = ceph_get_caps(file, CEPH_CAP_FILE_WR, want, pos + count, &got, NULL); if (err < 0) goto out; @@ -1779,7 +1780,7 @@ static long ceph_fallocate(struct file *file, int mode, else want = CEPH_CAP_FILE_BUFFER; - ret = ceph_get_caps(ci, CEPH_CAP_FILE_WR, want, endoff, &got, NULL); + ret = ceph_get_caps(file, CEPH_CAP_FILE_WR, want, endoff, &got, NULL); if (ret < 0) goto unlock; @@ -1808,16 +1809,15 @@ static long ceph_fallocate(struct file *file, int mode, * src_ci. Two attempts are made to obtain both caps, and an error is return if * this fails; zero is returned on success. */ -static int get_rd_wr_caps(struct ceph_inode_info *src_ci, - loff_t src_endoff, int *src_got, - struct ceph_inode_info *dst_ci, +static int get_rd_wr_caps(struct file *src_filp, int *src_got, + struct file *dst_filp, loff_t dst_endoff, int *dst_got) { int ret = 0; bool retrying = false; retry_caps: - ret = ceph_get_caps(dst_ci, CEPH_CAP_FILE_WR, CEPH_CAP_FILE_BUFFER, + ret = ceph_get_caps(dst_filp, CEPH_CAP_FILE_WR, CEPH_CAP_FILE_BUFFER, dst_endoff, dst_got, NULL); if (ret < 0) return ret; @@ -1827,24 +1827,24 @@ static int get_rd_wr_caps(struct ceph_inode_info *src_ci, * we would risk a deadlock by using ceph_get_caps. Thus, we'll do some * retry dance instead to try to get both capabilities. */ - ret = ceph_try_get_caps(src_ci, CEPH_CAP_FILE_RD, CEPH_CAP_FILE_SHARED, + ret = ceph_try_get_caps(file_inode(src_filp), + CEPH_CAP_FILE_RD, CEPH_CAP_FILE_SHARED, false, src_got); if (ret <= 0) { /* Start by dropping dst_ci caps and getting src_ci caps */ - ceph_put_cap_refs(dst_ci, *dst_got); + ceph_put_cap_refs(ceph_inode(file_inode(dst_filp)), *dst_got); if (retrying) { if (!ret) /* ceph_try_get_caps masks EAGAIN */ ret = -EAGAIN; return ret; } - ret = ceph_get_caps(src_ci, CEPH_CAP_FILE_RD, - CEPH_CAP_FILE_SHARED, src_endoff, - src_got, NULL); + ret = ceph_get_caps(src_filp, CEPH_CAP_FILE_RD, + CEPH_CAP_FILE_SHARED, -1, src_got, NULL); if (ret < 0) return ret; /*... drop src_ci caps too, and retry */ - ceph_put_cap_refs(src_ci, *src_got); + ceph_put_cap_refs(ceph_inode(file_inode(src_filp)), *src_got); retrying = true; goto retry_caps; } @@ -1958,8 +1958,8 @@ static ssize_t ceph_copy_file_range(struct file *src_file, loff_t src_off, * clients may have dirty data in their caches. And OSDs know nothing * about caps, so they can't safely do the remote object copies. */ - err = get_rd_wr_caps(src_ci, (src_off + len), &src_got, - dst_ci, (dst_off + len), &dst_got); + err = get_rd_wr_caps(src_file, &src_got, + dst_file, (dst_off + len), &dst_got); if (err < 0) { dout("get_rd_wr_caps returned %d\n", err); ret = -EOPNOTSUPP; @@ -2016,9 +2016,8 @@ static ssize_t ceph_copy_file_range(struct file *src_file, loff_t src_off, goto out; } len -= ret; - err = get_rd_wr_caps(src_ci, (src_off + len), - &src_got, dst_ci, - (dst_off + len), &dst_got); + err = get_rd_wr_caps(src_file, &src_got, + dst_file, (dst_off + len), &dst_got); if (err < 0) goto out; err = is_file_size_ok(src_inode, dst_inode, diff --git a/fs/ceph/super.h b/fs/ceph/super.h index 2e516d47052f..f45a06475f4f 100644 --- a/fs/ceph/super.h +++ b/fs/ceph/super.h @@ -1061,9 +1061,9 @@ extern int ceph_encode_dentry_release(void **p, struct dentry *dn, struct inode *dir, int mds, int drop, int unless); -extern int ceph_get_caps(struct ceph_inode_info *ci, int need, int want, +extern int ceph_get_caps(struct file *filp, int need, int want, loff_t endoff, int *got, struct page **pinned_page); -extern int ceph_try_get_caps(struct ceph_inode_info *ci, +extern int ceph_try_get_caps(struct inode *inode, int need, int want, bool nonblock, int *got); /* for counting open files by mode */ @@ -1074,7 +1074,7 @@ extern void ceph_put_fmode(struct ceph_inode_info *ci, int mode); extern const struct address_space_operations ceph_aops; extern int ceph_mmap(struct file *file, struct vm_area_struct *vma); extern int ceph_uninline_data(struct file *filp, struct page *locked_page); -extern int ceph_pool_perm_check(struct ceph_inode_info *ci, int need); +extern int ceph_pool_perm_check(struct inode *inode, int need); extern void ceph_pool_perm_destroy(struct ceph_mds_client* mdsc); /* file.c */
This is preparetion for checking filp error. Signed-off-by: "Yan, Zheng" <zyan@redhat.com> --- fs/ceph/addr.c | 15 +++++++++------ fs/ceph/caps.c | 32 +++++++++++++++++--------------- fs/ceph/file.c | 35 +++++++++++++++++------------------ fs/ceph/super.h | 6 +++--- 4 files changed, 46 insertions(+), 42 deletions(-)