summaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorAlex Elder <elder@inktank.com>2013-04-03 15:03:53 -0500
committerSage Weil <sage@inktank.com>2013-05-01 21:17:53 -0700
commit25d71cb92d8eb48df9cbd8cc4bb28e88ee8e88d9 (patch)
treefcb5cbf66c8f41698317238699e94e383d0895fe /fs
parentef4859d6479d19bcc65c3156cf3b7dd747355c29 (diff)
downloadop-kernel-dev-25d71cb92d8eb48df9cbd8cc4bb28e88ee8e88d9.zip
op-kernel-dev-25d71cb92d8eb48df9cbd8cc4bb28e88ee8e88d9.tar.gz
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>
Diffstat (limited to 'fs')
-rw-r--r--fs/ceph/addr.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/ceph/addr.c b/fs/ceph/addr.c
index 45745aa..ae438d0 100644
--- a/fs/ceph/addr.c
+++ b/fs/ceph/addr.c
@@ -900,7 +900,7 @@ get_more_pages:
}
/* submit the write */
- offset = req->r_data_out.pages[0]->index << PAGE_CACHE_SHIFT;
+ offset = page_offset(req->r_data_out.pages[0]);
len = min((snap_size ? snap_size : i_size_read(inode)) - offset,
(u64)locked_pages << PAGE_CACHE_SHIFT);
dout("writepages got %d pages at %llu~%llu\n",
OpenPOWER on IntegriCloud