From fd8f3b44c0ed9d7178240af607fb770fa1cd02e4 Mon Sep 17 00:00:00 2001 From: Tao Ma Date: Sat, 30 Jan 2010 23:32:19 +0800 Subject: [PATCH] --- yaml --- r: 180359 b: refs/heads/master c: d622b89a2f58613a9c1407b22b02aecdd2187a7c h: refs/heads/master i: 180357: 292d0cc13a24a35f10373e6801a485abb5e2f5d9 180355: 34d7f21e3d9b2f6b6eccd6e85e25d69bb3321146 180351: 46a63357cbaff0c621c2c9269499981826b46d42 v: v3 --- [refs] | 2 +- trunk/fs/ocfs2/refcounttree.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index f6f98ff44cc2..b2e2497ea470 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 26636bf6b2010aa84c54d577231e017ba71493d0 +refs/heads/master: d622b89a2f58613a9c1407b22b02aecdd2187a7c diff --git a/trunk/fs/ocfs2/refcounttree.c b/trunk/fs/ocfs2/refcounttree.c index 74db2be75dd6..5b64468de0b0 100644 --- a/trunk/fs/ocfs2/refcounttree.c +++ b/trunk/fs/ocfs2/refcounttree.c @@ -2945,7 +2945,7 @@ static int ocfs2_duplicate_clusters_by_page(handle_t *handle, while (offset < end) { page_index = offset >> PAGE_CACHE_SHIFT; - map_end = (page_index + 1) << PAGE_CACHE_SHIFT; + map_end = ((loff_t)page_index + 1) << PAGE_CACHE_SHIFT; if (map_end > end) map_end = end; @@ -3170,7 +3170,7 @@ static int ocfs2_cow_sync_writeback(struct super_block *sb, while (offset < end) { page_index = offset >> PAGE_CACHE_SHIFT; - map_end = (page_index + 1) << PAGE_CACHE_SHIFT; + map_end = ((loff_t)page_index + 1) << PAGE_CACHE_SHIFT; if (map_end > end) map_end = end;