From 0d4be9a10e6064d84ce37958326f93ef3590e8d6 Mon Sep 17 00:00:00 2001 From: Theodore Ts'o Date: Sat, 18 Dec 2010 13:13:40 -0500 Subject: [PATCH] --- yaml --- r: 229102 b: refs/heads/master c: a1dd53318409ed6a27a8ce4fecf52e1326a100c0 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/fs/jbd2/transaction.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index b372b1b02fcb..ac6dc0b445e4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: cfef2c6a559b1e37cbc7e7c1b51f82d26abf24ec +refs/heads/master: a1dd53318409ed6a27a8ce4fecf52e1326a100c0 diff --git a/trunk/fs/jbd2/transaction.c b/trunk/fs/jbd2/transaction.c index 10b5e3b1ca8b..80f9b2a3880b 100644 --- a/trunk/fs/jbd2/transaction.c +++ b/trunk/fs/jbd2/transaction.c @@ -774,7 +774,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); /* Fire data frozen trigger just before we copy the data */ jbd2_buffer_frozen_trigger(jh, source + offset,