Subject: [merged] ocfs2-fix-incorrect-i_size-of-global-bitmap-inode-after-resize.patch removed from -mm tree
To: joseph.qi@xxxxxxxxxx,jlbec@xxxxxxxxxxxx,mfasheh@xxxxxxxx,mm-commits@xxxxxxxxxxxxxxx
From: akpm@xxxxxxxxxxxxxxxxxxxx
Date: Thu, 05 Jun 2014 12:42:56 -0700
The patch titled
Subject: ocfs2: fix incorrect i_size of global bitmap inode after resize
has been removed from the -mm tree. Its filename was
ocfs2-fix-incorrect-i_size-of-global-bitmap-inode-after-resize.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
From: Joseph Qi <joseph.qi@xxxxxxxxxx>
Subject: ocfs2: fix incorrect i_size of global bitmap inode after resize
Ocfs2 cluster size may be 1MB, which has 20 bits. When resize, the input
new clusters is mostly the number of clusters in a group
descriptor(32256).
Since the input clusters is defined as type int, so it will overflow when
shift left 20 bits and then lead to incorrect global bitmap i_size.
Signed-off-by: Joseph Qi <joseph.qi@xxxxxxxxxx>
Cc: Mark Fasheh <mfasheh@xxxxxxxx>
Cc: Joel Becker <jlbec@xxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
fs/ocfs2/resize.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff -puN fs/ocfs2/resize.c~ocfs2-fix-incorrect-i_size-of-global-bitmap-inode-after-resize fs/ocfs2/resize.c
--- a/fs/ocfs2/resize.c~ocfs2-fix-incorrect-i_size-of-global-bitmap-inode-after-resize
+++ a/fs/ocfs2/resize.c
@@ -153,7 +153,7 @@ static int ocfs2_update_last_group_and_i
spin_lock(&OCFS2_I(bm_inode)->ip_lock);
OCFS2_I(bm_inode)->ip_clusters = le32_to_cpu(fe->i_clusters);
- le64_add_cpu(&fe->i_size, new_clusters << osb->s_clustersize_bits);
+ le64_add_cpu(&fe->i_size, (u64)new_clusters << osb->s_clustersize_bits);
spin_unlock(&OCFS2_I(bm_inode)->ip_lock);
i_size_write(bm_inode, le64_to_cpu(fe->i_size));
@@ -563,7 +563,7 @@ int ocfs2_group_add(struct inode *inode,
spin_lock(&OCFS2_I(main_bm_inode)->ip_lock);
OCFS2_I(main_bm_inode)->ip_clusters = le32_to_cpu(fe->i_clusters);
- le64_add_cpu(&fe->i_size, input->clusters << osb->s_clustersize_bits);
+ le64_add_cpu(&fe->i_size, (u64)input->clusters << osb->s_clustersize_bits);
spin_unlock(&OCFS2_I(main_bm_inode)->ip_lock);
i_size_write(main_bm_inode, le64_to_cpu(fe->i_size));
_
Patches currently in -mm which might be from joseph.qi@xxxxxxxxxx are
origin.patch
ocfs2-fix-a-tiny-race-when-running-dirop_fileop_racer.patch
linux-next.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
