gfs2: Fix an incorrect gfs2_assert()
PATCH 1/1 gfs2: Fix an incorrect gfs2_assert()
When updating the inode information after a change in allocation, convert the change into the same units as the inode's i_blocks count before comparing it in an assertion.
Also, change the comparison so that it is still possible to set i_blocks to zero by adding -i_blocks, something that was previously only possible because of the difference in units.
--- fs/gfs2/inode.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
fs/gfs2/inode.h +2 -2
@@ -59,8 +59,8 @@ static inline u64 gfs2_get_inode_blocks(const struct inode *inode)static inline void gfs2_add_inode_blocks (struct inode *inode,s64 change) { -gfs2_assert (GFS2_SB (inode), (change >=0 || inode->i_blocks > -change)); - change *= (GFS2_SB (inode)->sd_sb.sb_bsize/GFS2_BASIC_BLOCK ); + change <<= (GFS2_SB (inode)->sd_sb.sb_bsize_shift -GFS2_BASIC_BLOCK_SHIFT ); +gfs2_assert (GFS2_SB (inode), (change >=0 || inode->i_blocks >= -change)); inode->i_blocks += change; }
Signature · 5 lines
2.17.2 -- Tim Smith <[email protected]>
PATCH 1/1 gfs2: Fix an incorrect gfs2_assert()
----- Original Message -----
Quoted 33 lines
When updating the inode information after a change in allocation, convert the change into the same units as the inode's
i_blockscount before comparing it in an assertion.Also, change the comparison so that it is still possible to set
i_blocksto zero by adding -i_blocks, something that was previously only possible because of the difference in units.Signed-off-by Tim Smith <[email protected]>--- fs/gfs2/inode.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)fs/gfs2/inode.h +2
-3@@ -59,8 +59,8 @@ static inline u64 gfs2_get_inode_blocks(const struct inode *inode)static inline void gfs2_add_inode_blocks (struct inode *inode,s64 change) { -gfs2_assert (GFS2_SB (inode), (change >=0 || inode->i_blocks > -change)); - change *= (GFS2_SB (inode)->sd_sb.sb_bsize/GFS2_BASIC_BLOCK ); + change <<= (GFS2_SB (inode)->sd_sb.sb_bsize_shift -GFS2_BASIC_BLOCK_SHIFT ); +gfs2_assert (GFS2_SB (inode), (change >=0 || inode->i_blocks >= -change)); inode->i_blocks += change; } --2.17.2
Quoted 2 lines
--
Tim Smith <[email protected]>
Hi Tim,
Did you see Andreas's patch posted on the 9th? It does the same exact thing, but it's a little bit simpler and uses fewer levels of pointer indirection.
Yours: change <<= (GFS2_SB(inode)->sd_sb.sb_bsize_shift - GFS2_BASIC_BLOCK_SHIFT); Andreas: change <<= inode->i_blkbits - 9;
I suppose we could compromise and do:
change <<= inode->i_blkbits - GFS2_BASIC_BLOCK_SHIFT;
Unless you object or have a better idea, I'll push Andrea's patch.
Regards,
Bob Peterson
Red Hat File Systems