From 620440107d1691ccad83aec6b41e13019cbb5fac Mon Sep 17 00:00:00 2001 From: Alex Elder Date: Wed, 3 Apr 2013 15:03:53 -0500 Subject: [PATCH] --- yaml --- r: 373403 b: refs/heads/master c: 25d71cb92d8eb48df9cbd8cc4bb28e88ee8e88d9 h: refs/heads/master i: 373401: 8f3d1c8bcb146579cb864743058de7b71d85c52e 373399: a5fa9e2c2dc615ae0b42348874e917578d714c94 v: v3 --- [refs] | 2 +- trunk/fs/ceph/addr.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index d8ab63b2766c..be11f58a90f4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ef4859d6479d19bcc65c3156cf3b7dd747355c29 +refs/heads/master: 25d71cb92d8eb48df9cbd8cc4bb28e88ee8e88d9 diff --git a/trunk/fs/ceph/addr.c b/trunk/fs/ceph/addr.c index 45745aae4786..ae438d02a422 100644 --- a/trunk/fs/ceph/addr.c +++ b/trunk/fs/ceph/addr.c @@ -900,7 +900,7 @@ static int ceph_writepages_start(struct address_space *mapping, } /* 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",