From: Namhyung Kim <namhyung@gmail.com>
Date: Mon, 4 Oct 2010 16:03:40 +0000 (+0900)
Subject: jbd: Use offset_in_page() instead of manual calculation
X-Git-Tag: v2.6.37-rc1~78^2~17
X-Git-Url: https://bbs.cooldavid.org/git/?p=net-next-2.6.git;a=commitdiff_plain;h=8117f98c058dbe463eaba2b51b84d19bd5d78804

jbd: Use offset_in_page() instead of manual calculation

Signed-off-by: Namhyung Kim <namhyung@gmail.com>
Signed-off-by: Jan Kara <jack@suse.cz>
---

diff --git a/fs/jbd/transaction.c b/fs/jbd/transaction.c
index 981449ca8f1..c9bb7a73f8f 100644
--- a/fs/jbd/transaction.c
+++ b/fs/jbd/transaction.c
@@ -711,7 +711,7 @@ done:
 		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);