Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8117f98c authored by Namhyung Kim's avatar Namhyung Kim Committed by Jan Kara
Browse files

jbd: Use offset_in_page() instead of manual calculation 



Signed-off-by: default avatarNamhyung Kim <namhyung@gmail.com>
Signed-off-by: default avatarJan Kara <jack@suse.cz>
parent 2b239769

fs/jbd/transaction.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -711,7 +711,7 @@ do_get_write_access(handle_t *handle, struct journal_head *jh, 
		J_EXPECT_JH(jh, buffer_uptodate(jh2bh(jh)),

		J_EXPECT_JH(jh, buffer_uptodate(jh2bh(jh)),

			    "Possible IO failure.\n");

			    "Possible IO failure.\n");

		page = jh2bh(jh)->b_page;

		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);

		source = kmap_atomic(page, KM_USER0);

		memcpy(jh->b_frozen_data, source+offset, jh2bh(jh)->b_size);

		memcpy(jh->b_frozen_data, source+offset, jh2bh(jh)->b_size);

		kunmap_atomic(source, KM_USER0);

		kunmap_atomic(source, KM_USER0);