ceph: add object version support for sync read

Always return the last object's version.

Signed-off-by: Xiubo Li <xiubli@redhat.com>
Signed-off-by: Jeff Layton <jlayton@kernel.org>

diff --git a/fs/ceph/file.c b/fs/ceph/file.c
index d21378eeb43b548f039724d650e6c382ff95602d..31de744b1a5f2672a7086119cde53b6cafbb86ca 100644 (file)
--- a/fs/ceph/file.c
+++ b/fs/ceph/file.c
@@ -952,7 +952,8 @@ enum {
  * only return a short read to the caller if we hit EOF.
  */
 ssize_t __ceph_sync_read(struct inode *inode, loff_t *ki_pos,
-                        struct iov_iter *to, int *retry_op)
+                        struct iov_iter *to, int *retry_op,
+                        u64 *last_objver)
 {
        struct ceph_inode_info *ci = ceph_inode(inode);
        struct ceph_fs_client *fsc = ceph_inode_to_client(inode);
@@ -962,6 +963,7 @@ ssize_t __ceph_sync_read(struct inode *inode, loff_t *ki_pos,
        u64 len = iov_iter_count(to);
        u64 i_size = i_size_read(inode);
        bool sparse = ceph_test_mount_opt(fsc, SPARSEREAD);
+       u64 objver = 0;
 
        dout("sync_read on inode %p %llx~%llx\n", inode, *ki_pos, len);
 
@@ -1031,6 +1033,9 @@ ssize_t __ceph_sync_read(struct inode *inode, loff_t *ki_pos,
                                         req->r_end_latency,
                                         len, ret);
 
+               if (ret > 0)
+                       objver = req->r_version;
+
                i_size = i_size_read(inode);
                dout("sync_read %llu~%llu got %zd i_size %llu%s\n",
                     off, len, ret, i_size, (more ? " MORE" : ""));
@@ -1092,6 +1097,9 @@ ssize_t __ceph_sync_read(struct inode *inode, loff_t *ki_pos,
                }
        }
 
+       if (last_objver && ret > 0)
+               *last_objver = objver;
+
        dout("sync_read result %zd retry_op %d\n", ret, *retry_op);
        return ret;
 }
@@ -1105,7 +1113,7 @@ static ssize_t ceph_sync_read(struct kiocb *iocb, struct iov_iter *to,
        dout("sync_read on file %p %llx~%zx %s\n", file, iocb->ki_pos,
             iov_iter_count(to), (file->f_flags & O_DIRECT) ? "O_DIRECT" : "");
 
-       return __ceph_sync_read(inode, &iocb->ki_pos, to, retry_op);
+       return __ceph_sync_read(inode, &iocb->ki_pos, to, retry_op, NULL);
 }
 
 struct ceph_aio_request {

diff --git a/fs/ceph/super.h b/fs/ceph/super.h
index 8b5095bd18abde5926f3d9be8e443febbcb77bff..7e998c6d57185b919ff2182492719d1be400a5ad 100644 (file)
--- a/fs/ceph/super.h
+++ b/fs/ceph/super.h
@@ -1277,7 +1277,8 @@ extern int ceph_open(struct inode *inode, struct file *file);
 extern int ceph_atomic_open(struct inode *dir, struct dentry *dentry,
                            struct file *file, unsigned flags, umode_t mode);
 extern ssize_t __ceph_sync_read(struct inode *inode, loff_t *ki_pos,
-                               struct iov_iter *to, int *retry_op);
+                               struct iov_iter *to, int *retry_op,
+                               u64 *last_objver);
 extern int ceph_release(struct inode *inode, struct file *filp);
 extern void ceph_fill_inline_data(struct inode *inode, struct page *locked_page,
                                  char *data, size_t len);