On Fri, 2021-12-17 at 15:29 +0000, David Howells wrote:
> Remove some other bits where a ceph file can't be inline because we
> uninlined it when we opened it for writing.
>
> Signed-off-by: David Howells <dhowells@xxxxxxxxxx>
> ---
>
> fs/ceph/addr.c | 4 +---
> fs/ceph/file.c | 4 ----
> 2 files changed, 1 insertion(+), 7 deletions(-)
>
> diff --git a/fs/ceph/addr.c b/fs/ceph/addr.c
> index 6e1b15cc87cf..553e2b5653f3 100644
> --- a/fs/ceph/addr.c
> +++ b/fs/ceph/addr.c
> @@ -1534,11 +1534,9 @@ static vm_fault_t ceph_page_mkwrite(struct vm_fault *vmf)
> ceph_put_snap_context(snapc);
> } while (err == 0);
>
> - if (ret == VM_FAULT_LOCKED ||
> - ci->i_inline_version != CEPH_INLINE_NONE) {
> + if (ret == VM_FAULT_LOCKED) {
> int dirty;
> spin_lock(&ci->i_ceph_lock);
> - ci->i_inline_version = CEPH_INLINE_NONE;
> dirty = __ceph_mark_dirty_caps(ci, CEPH_CAP_FILE_WR,
> &prealloc_cf);
> spin_unlock(&ci->i_ceph_lock);
> diff --git a/fs/ceph/file.c b/fs/ceph/file.c
> index d16ba8720783..4a0aeed7f660 100644
> --- a/fs/ceph/file.c
> +++ b/fs/ceph/file.c
> @@ -1031,7 +1031,6 @@ static void ceph_aio_complete(struct inode *inode,
> }
>
> spin_lock(&ci->i_ceph_lock);
> - ci->i_inline_version = CEPH_INLINE_NONE;
> dirty = __ceph_mark_dirty_caps(ci, CEPH_CAP_FILE_WR,
> &aio_req->prealloc_cf);
> spin_unlock(&ci->i_ceph_lock);
> @@ -1838,7 +1837,6 @@ static ssize_t ceph_write_iter(struct kiocb *iocb, struct iov_iter *from)
> int dirty;
>
> spin_lock(&ci->i_ceph_lock);
> - ci->i_inline_version = CEPH_INLINE_NONE;
> dirty = __ceph_mark_dirty_caps(ci, CEPH_CAP_FILE_WR,
> &prealloc_cf);
> spin_unlock(&ci->i_ceph_lock);
> @@ -2116,7 +2114,6 @@ static long ceph_fallocate(struct file *file, int mode,
>
> if (!ret) {
> spin_lock(&ci->i_ceph_lock);
> - ci->i_inline_version = CEPH_INLINE_NONE;
> dirty = __ceph_mark_dirty_caps(ci, CEPH_CAP_FILE_WR,
> &prealloc_cf);
> spin_unlock(&ci->i_ceph_lock);
> @@ -2509,7 +2506,6 @@ static ssize_t __ceph_copy_file_range(struct file *src_file, loff_t src_off,
> }
> /* Mark Fw dirty */
> spin_lock(&dst_ci->i_ceph_lock);
> - dst_ci->i_inline_version = CEPH_INLINE_NONE;
> dirty = __ceph_mark_dirty_caps(dst_ci, CEPH_CAP_FILE_WR, &prealloc_cf);
> spin_unlock(&dst_ci->i_ceph_lock);
> if (dirty)
>
>
I'll probably just fold this one into the first patch if that's ok.
--
Jeff Layton <jlayton@xxxxxxxxxx>
