Updated from Linux LTS 3.10.25 to 3.10.26
This commit is contained in:
@@ -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,
|
||||
ceph_file_layout_pg_pool(ci->i_layout));
|
||||
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) {
|
||||
|
||||
Reference in New Issue
Block a user