Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 25d71cb92d8eb48df9cbd8cc4bb28e88ee8e88d9

Authored by Alex Elder
Committed by Sage Weil
1 parent ef4859d647
Exists in smarc-l5.0.0_1.0.0-ga and in 5 other branches imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga

ceph: use page_offset() in ceph_writepages_start() 

There's one spot in ceph_writepages_start() that open-codes what
page_offset() does safely.  Use the macro so we don't have to worry
about wrapping.

This resolves:
    http://tracker.ceph.com/issues/4648

Signed-off-by: Alex Elder <elder@inktank.com>
Reviewed-by: Josh Durgin <josh.durgin@inktank.com>

Showing 1 changed file with 1 additions and 1 deletions Side-by-side Diff

... ... @@ -900,7 +900,7 @@
900 900 }
901 901  
902 902 /* submit the write */
903   - offset = req->r_data_out.pages[0]->index << PAGE_CACHE_SHIFT;
  903 + offset = page_offset(req->r_data_out.pages[0]);
904 904 len = min((snap_size ? snap_size : i_size_read(inode)) - offset,
905 905 (u64)locked_pages << PAGE_CACHE_SHIFT);
906 906 dout("writepages got %d pages at %llu~%llu\n",