summaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorGeng, Jichao <geng.jichao@h3c.com>2017-01-05 16:50:39 +0800
committerIlya Dryomov <idryomov@gmail.com>2017-01-12 19:31:01 +0100
commit84fcc2d2bd6cbf621e49e1d0f7eaef2e3c666b40 (patch)
tree6fb8f91a59da31402086e60e89554a2de820e702 /fs
parentcc8e8342930129aa2c9b629e1653e4681f0896ea (diff)
downloadtalos-obmc-linux-84fcc2d2bd6cbf621e49e1d0f7eaef2e3c666b40.tar.gz
talos-obmc-linux-84fcc2d2bd6cbf621e49e1d0f7eaef2e3c666b40.zip
ceph: fix get_oldest_context()
For no snapshot case, we should use ci->truncate_{seq,size}. Fixes: 5f743e456606 ("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>
Diffstat (limited to 'fs')
-rw-r--r--fs/ceph/addr.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/ceph/addr.c b/fs/ceph/addr.c
index 9cd0c0ea7cdb..e4b066cd912a 100644
--- a/fs/ceph/addr.c
+++ b/fs/ceph/addr.c
@@ -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;
OpenPOWER on IntegriCloud