diff --git a/[refs] b/[refs] index 7aa2a55788e0..1d753f8bc6d0 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 35e054a66e07f508aa7cfabc7db1757379093689 +refs/heads/master: 5600f5ebd318f7af6f4b19a29f08d18bb85264e5 diff --git a/trunk/fs/ceph/osdmap.c b/trunk/fs/ceph/osdmap.c index 60012e05bdfd..a9a4143234fa 100644 --- a/trunk/fs/ceph/osdmap.c +++ b/trunk/fs/ceph/osdmap.c @@ -752,7 +752,7 @@ void ceph_calc_file_object_mapping(struct ceph_file_layout *layout, *bno = objsetno * sc + stripepos; dout("objset %u * sc %u = bno %u\n", objsetno, sc, (unsigned)*bno); - /* *oxoff = *off / layout->fl_stripe_unit; */ + /* *oxoff = *off % layout->fl_stripe_unit; */ t = off; *oxoff = do_div(t, su); *oxlen = min_t(u64, *plen, su - *oxoff);