Skip to content
/ linux Public

Commit 757873a

Browse files
ethanwu-synoSasha Levin
authored andcommitted
ceph: supply snapshot context in ceph_zero_partial_object()
[ Upstream commit f16bd3f ] 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> Signed-off-by: Sasha Levin <sashal@kernel.org>
1 parent 582aa12 commit 757873a

File tree

1 file changed

+16
-1
lines changed

1 file changed

+16
-1
lines changed

fs/ceph/file.c

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1998,6 +1998,7 @@ static int ceph_zero_partial_object(struct inode *inode,
19981998
struct ceph_inode_info *ci = ceph_inode(inode);
19991999
struct ceph_fs_client *fsc = ceph_inode_to_client(inode);
20002000
struct ceph_osd_request *req;
2001+
struct ceph_snap_context *snapc;
20012002
int ret = 0;
20022003
loff_t zero = 0;
20032004
int op;
@@ -2012,12 +2013,25 @@ static int ceph_zero_partial_object(struct inode *inode,
20122013
op = CEPH_OSD_OP_ZERO;
20132014
}
20142015

2016+
spin_lock(&ci->i_ceph_lock);
2017+
if (__ceph_have_pending_cap_snap(ci)) {
2018+
struct ceph_cap_snap *capsnap =
2019+
list_last_entry(&ci->i_cap_snaps,
2020+
struct ceph_cap_snap,
2021+
ci_item);
2022+
snapc = ceph_get_snap_context(capsnap->context);
2023+
} else {
2024+
BUG_ON(!ci->i_head_snapc);
2025+
snapc = ceph_get_snap_context(ci->i_head_snapc);
2026+
}
2027+
spin_unlock(&ci->i_ceph_lock);
2028+
20152029
req = ceph_osdc_new_request(&fsc->client->osdc, &ci->i_layout,
20162030
ceph_vino(inode),
20172031
offset, length,
20182032
0, 1, op,
20192033
CEPH_OSD_FLAG_WRITE,
2020-
NULL, 0, 0, false);
2034+
snapc, 0, 0, false);
20212035
if (IS_ERR(req)) {
20222036
ret = PTR_ERR(req);
20232037
goto out;
@@ -2031,6 +2045,7 @@ static int ceph_zero_partial_object(struct inode *inode,
20312045
ceph_osdc_put_request(req);
20322046

20332047
out:
2048+
ceph_put_snap_context(snapc);
20342049
return ret;
20352050
}
20362051

0 commit comments

Comments
 (0)