ocfs2: fix issue that ocfs2_setattr() does not deal with new_i_size==i_size
PATCH 10/11 ocfs2: fix issue that ocfs2_setattr() does not deal with new_i_size==i_size
From: Younger Liu <[email protected]>
Subject: ocfs2: fix issue that ocfs2_setattr() does not deal with new_i_size==i_size
The issue scenario is as following:
- Create a small file and fallocate a large disk space for a file with FALLOC_FL_KEEP_SIZE option.
- ftruncate the file back to the original size again. but the disk free space is not changed back. This is a real bug that be fixed in this patch.
In order to solve the issue above, we modified ocfs2_setattr(), if attr->ia_size != i_size_read(inode), It calls ocfs2_truncate_file(), and truncate disk space to attr->ia_size.
---
fs/ocfs2/alloc.c | 2 +- fs/ocfs2/file.c | 9 ++------- 2 files changed, 3 insertions(+), 8 deletions(-)
fs/ocfs2/alloc.c renamed from fs/ocfs2/alloc.c~ocfs2-fix-issue-that-ocfs2_setattr-does-not-deal-with-new_i_size==i_size +1 -1
@@ -7158,7 +7158,7 @@ int ocfs2_truncate_inline(struct inode *if (end >i_size_read (inode)) end =i_size_read (inode); -BUG_ON (start >= end); +BUG_ON (start > end); if (!(OCFS2_I(inode)->ip_dyn_features & OCFS2_INLINE_DATA_FL) || !(le16_to_cpu(di->i_dyn_features) & OCFS2_INLINE_DATA_FL) ||
fs/ocfs2/file.c renamed from fs/ocfs2/file.c~ocfs2-fix-issue-that-ocfs2_setattr-does-not-deal-with-new_i_size==i_size +2 -7
@@ -477,11 +477,6 @@ static int ocfs2_truncate_file(struct in goto bail; } -/* lets handle the simple truncate cases before doing any more -* cluster locking. */ -if (new_i_size ==le64_to_cpu (fe->i_size)) - goto bail; -down_write (&OCFS2_I (inode)->ip_alloc_sem); ocfs2_resv_discard(&osb->osb_la_resmap,
@@ -1148,14 +1143,14 @@ int ocfs2_setattr(struct dentry *dentry, goto bail_unlock_rw; } -if (size_change && attr->ia_size !=i_size_read (inode)) { +if (size_change) { status =inode_newsize_ok (inode, attr->ia_size);if (status) goto bail_unlock;inode_dio_wait (inode); -if (i_size_read (inode) > attr->ia_size) { +if (i_size_read (inode) >= attr->ia_size) {if (ocfs2_should_order_data (inode)) { status =ocfs2_begin_ordered_truncate (inode, attr->ia_size);
_
PATCH 10/11 ocfs2: fix issue that ocfs2_setattr() does not deal with new_i_size==i_size
Quoted 16 lines · akpm at linux-foundation.org
From: Younger Liu <[email protected]>
Subject: ocfs2: fix issue thatocfs2_setattr()does not deal with new_i_size==i_sizeThe issue scenario is as following:
- Create a small file and fallocate a large disk space for a file with
FALLOC_FL_KEEP_SIZEoption.- ftruncate the file back to the original size again. but the disk free space is not changed back. This is a real bug that be fixed in this patch.
In order to solve the issue above, we modified
ocfs2_setattr(), ifattr->ia_size!=i_size_read(inode), It callsocfs2_truncate_file(), and truncate disk space toattr->ia_size.
Quoted 8 lines
Signed-off-by Younger Liu <[email protected]>Reviewed-by Jie Liu <[email protected]>Tested-by Jie Liu <[email protected]>Cc Joel Becker <[email protected]>Cc Mark Fasheh <[email protected]>Cc Sunil Mushran <[email protected]>Reviewed-by Jensen <[email protected]>Signed-off-by Andrew Morton <[email protected]>
This looks good, thanks for the fix Younger.
--Mark
--
Mark Fasheh