diff --git a/[refs] b/[refs]
index 4733c6998a7d..fceed86ba5a4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2b23976908d9f8406f8b10b86c83b2cee302bc7d
+refs/heads/master: 8117f98c058dbe463eaba2b51b84d19bd5d78804
diff --git a/trunk/fs/jbd/transaction.c b/trunk/fs/jbd/transaction.c
index 981449ca8f18..c9bb7a73f8fd 100644
--- a/trunk/fs/jbd/transaction.c
+++ b/trunk/fs/jbd/transaction.c
@@ -711,7 +711,7 @@ do_get_write_access(handle_t *handle, struct journal_head *jh,
 		J_EXPECT_JH(jh, buffer_uptodate(jh2bh(jh)),
 			    "Possible IO failure.\n");
 		page = jh2bh(jh)->b_page;
-		offset = ((unsigned long) jh2bh(jh)->b_data) & ~PAGE_MASK;
+		offset = offset_in_page(jh2bh(jh)->b_data);
 		source = kmap_atomic(page, KM_USER0);
 		memcpy(jh->b_frozen_data, source+offset, jh2bh(jh)->b_size);
 		kunmap_atomic(source, KM_USER0);