Skip to content

Commit f16bd3f

Browse files
ethanwu-synoidryomov
authored andcommitted
ceph: supply snapshot context in ceph_zero_partial_object()
The ceph_zero_partial_object function was missing proper snapshot context for its OSD write operations, which could lead to data inconsistencies in snapshots. Reproducer: ../src/vstart.sh --new -x --localhost --bluestore ./bin/ceph auth caps client.fs_a mds 'allow rwps fsname=a' mon 'allow r fsname=a' osd 'allow rw tag cephfs data=a' mount -t ceph fs_a@.a=/ /mnt/mycephfs/ -o conf=./ceph.conf dd if=/dev/urandom of=/mnt/mycephfs/foo bs=64K count=1 mkdir /mnt/mycephfs/.snap/snap1 md5sum /mnt/mycephfs/.snap/snap1/foo fallocate -p -o 0 -l 4096 /mnt/mycephfs/foo echo 3 > /proc/sys/vm/drop/caches md5sum /mnt/mycephfs/.snap/snap1/foo # get different md5sum!! Cc: stable@vger.kernel.org Fixes: ad7a60d ("ceph: punch hole support") Signed-off-by: ethanwu <ethanwu@synology.com> Reviewed-by: Viacheslav Dubeyko <Slava.Dubeyko@ibm.com> Tested-by: Viacheslav Dubeyko <Slava.Dubeyko@ibm.com> Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
1 parent 8356b4b commit f16bd3f

1 file changed

Lines changed: 16 additions & 1 deletion

File tree

fs/ceph/file.c

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2568,6 +2568,7 @@ static int ceph_zero_partial_object(struct inode *inode,
25682568
struct ceph_inode_info *ci = ceph_inode(inode);
25692569
struct ceph_fs_client *fsc = ceph_inode_to_fs_client(inode);
25702570
struct ceph_osd_request *req;
2571+
struct ceph_snap_context *snapc;
25712572
int ret = 0;
25722573
loff_t zero = 0;
25732574
int op;
@@ -2582,12 +2583,25 @@ static int ceph_zero_partial_object(struct inode *inode,
25822583
op = CEPH_OSD_OP_ZERO;
25832584
}
25842585

2586+
spin_lock(&ci->i_ceph_lock);
2587+
if (__ceph_have_pending_cap_snap(ci)) {
2588+
struct ceph_cap_snap *capsnap =
2589+
list_last_entry(&ci->i_cap_snaps,
2590+
struct ceph_cap_snap,
2591+
ci_item);
2592+
snapc = ceph_get_snap_context(capsnap->context);
2593+
} else {
2594+
BUG_ON(!ci->i_head_snapc);
2595+
snapc = ceph_get_snap_context(ci->i_head_snapc);
2596+
}
2597+
spin_unlock(&ci->i_ceph_lock);
2598+
25852599
req = ceph_osdc_new_request(&fsc->client->osdc, &ci->i_layout,
25862600
ceph_vino(inode),
25872601
offset, length,
25882602
0, 1, op,
25892603
CEPH_OSD_FLAG_WRITE,
2590-
NULL, 0, 0, false);
2604+
snapc, 0, 0, false);
25912605
if (IS_ERR(req)) {
25922606
ret = PTR_ERR(req);
25932607
goto out;
@@ -2601,6 +2615,7 @@ static int ceph_zero_partial_object(struct inode *inode,
26012615
ceph_osdc_put_request(req);
26022616

26032617
out:
2618+
ceph_put_snap_context(snapc);
26042619
return ret;
26052620
}
26062621

0 commit comments

Comments
 (0)