Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2fbcbff1 authored by majianpeng's avatar majianpeng Committed by Sage Weil
Browse files

ceph: Add check returned value on func ceph_calc_ceph_pg. 



Func ceph_calc_ceph_pg maybe failed.So add check for returned value.

Signed-off-by: default avatarJianpeng Ma <majianpeng@gmail.com>
Reviewed-by: default avatarSage Weil <sage@inktank.com>
Signed-off-by: default avatarSage Weil <sage@inktank.com>
parent 7ab9b380

fs/ceph/ioctl.c

+6 −2
Original line number Diff line number Diff line
@@ -211,8 +211,12 @@ static long ceph_ioctl_get_dataloc(struct file *file, void __user *arg) 
	snprintf(dl.object_name, sizeof(dl.object_name), "%llx.%08llx",

		 ceph_ino(inode), dl.object_no);



	ceph_calc_ceph_pg(&pgid, dl.object_name, osdc->osdmap,

	r = ceph_calc_ceph_pg(&pgid, dl.object_name, osdc->osdmap,

				ceph_file_layout_pg_pool(ci->i_layout));

	if (r < 0) {

		up_read(&osdc->map_sem);

		return r;

	}



	dl.osd = ceph_calc_pg_primary(osdc->osdmap, pgid);

	if (dl.osd >= 0) {