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

Commit e535e2ef authored by Mark Fasheh's avatar Mark Fasheh
Browse files

ocfs2: Fix calculation of i_blocks during truncate 



We were setting i_blocks too early - before truncating any allocation.
Correct things to set i_blocks after the allocation change.

Signed-off-by: default avatarMark Fasheh <mark.fasheh@oracle.com>
parent 30b8548f

fs/ocfs2/alloc.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -5602,6 +5602,7 @@ static int ocfs2_do_truncate(struct ocfs2_super *osb, 
				      clusters_to_del;

				      clusters_to_del;

	spin_unlock(&OCFS2_I(inode)->ip_lock);

	spin_unlock(&OCFS2_I(inode)->ip_lock);

	le32_add_cpu(&fe->i_clusters, -clusters_to_del);

	le32_add_cpu(&fe->i_clusters, -clusters_to_del);

	inode->i_blocks = ocfs2_inode_sector_count(inode);





	status = ocfs2_trim_tree(inode, path, handle, tc,

	status = ocfs2_trim_tree(inode, path, handle, tc,

				 clusters_to_del, &delete_blk);

				 clusters_to_del, &delete_blk);

fs/ocfs2/file.c

+0 −1
Original line number Original line Diff line number Diff line
@@ -314,7 +314,6 @@ static int ocfs2_orphan_for_truncate(struct ocfs2_super *osb, 
	}

	}





	i_size_write(inode, new_i_size);

	i_size_write(inode, new_i_size);

	inode->i_blocks = ocfs2_align_bytes_to_sectors(new_i_size);

	inode->i_ctime = inode->i_mtime = CURRENT_TIME;

	inode->i_ctime = inode->i_mtime = CURRENT_TIME;





	di = (struct ocfs2_dinode *) fe_bh->b_data;

	di = (struct ocfs2_dinode *) fe_bh->b_data;