]> git.baikalelectronics.ru Git - kernel.git/commitdiff
ceph: fix get_oldest_context()
authorGeng, Jichao <geng.jichao@h3c.com>
Thu, 5 Jan 2017 08:50:39 +0000 (16:50 +0800)
committerIlya Dryomov <idryomov@gmail.com>
Thu, 12 Jan 2017 18:31:01 +0000 (19:31 +0100)
For no snapshot case, we should use ci->truncate_{seq,size}.

Fixes: f8a5c5ed91ea ("ceph: record truncate size/seq for snap data writeback")
Signed-off-by: Geng, Jichao <geng.jichao@h3c.com>
Signed-off-by: Yan, Zheng <zyan@redhat.com>
fs/ceph/addr.c

index 9cd0c0ea7cdbd5b683ab035927636f9f56b751d3..e4b066cd912ad9ea249c3c88f81026a68186095c 100644 (file)
@@ -502,9 +502,9 @@ static struct ceph_snap_context *get_oldest_context(struct inode *inode,
                dout(" head snapc %p has %d dirty pages\n",
                     snapc, ci->i_wrbuffer_ref_head);
                if (truncate_size)
-                       *truncate_size = capsnap->truncate_size;
+                       *truncate_size = ci->i_truncate_size;
                if (truncate_seq)
-                       *truncate_seq = capsnap->truncate_seq;
+                       *truncate_seq = ci->i_truncate_seq;
        }
        spin_unlock(&ci->i_ceph_lock);
        return snapc;