public inbox for linux-ext4@vger.kernel.org
 help / color / mirror / Atom feed
* [PATCH] ext4: keep existing extra fields when inode expands
@ 2017-05-19  7:13 Konstantin Khlebnikov
  2017-05-21  3:07 ` Theodore Ts'o
  0 siblings, 1 reply; 2+ messages in thread
From: Konstantin Khlebnikov @ 2017-05-19  7:13 UTC (permalink / raw)
  To: Andreas Dilger, linux-ext4, Theodore Ts'o, linux-kernel

ext4_expand_extra_isize() should clear only space between old and new size.

Signed-off-by: Konstantin Khlebnikov <khlebnikov@yandex-team.ru>
---
 fs/ext4/inode.c |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c
index 5834c4d76be8..7204e1a2801a 100644
--- a/fs/ext4/inode.c
+++ b/fs/ext4/inode.c
@@ -5637,8 +5637,9 @@ static int ext4_expand_extra_isize(struct inode *inode,
 	/* No extended attributes present */
 	if (!ext4_test_inode_state(inode, EXT4_STATE_XATTR) ||
 	    header->h_magic != cpu_to_le32(EXT4_XATTR_MAGIC)) {
-		memset((void *)raw_inode + EXT4_GOOD_OLD_INODE_SIZE, 0,
-			new_extra_isize);
+		memset((void *)raw_inode + EXT4_GOOD_OLD_INODE_SIZE +
+		       EXT4_I(inode)->i_extra_isize, 0,
+		       new_extra_isize - EXT4_I(inode)->i_extra_isize);
 		EXT4_I(inode)->i_extra_isize = new_extra_isize;
 		return 0;
 	}

^ permalink raw reply related	[flat|nested] 2+ messages in thread

* Re: [PATCH] ext4: keep existing extra fields when inode expands
  2017-05-19  7:13 [PATCH] ext4: keep existing extra fields when inode expands Konstantin Khlebnikov
@ 2017-05-21  3:07 ` Theodore Ts'o
  0 siblings, 0 replies; 2+ messages in thread
From: Theodore Ts'o @ 2017-05-21  3:07 UTC (permalink / raw)
  To: Konstantin Khlebnikov; +Cc: Andreas Dilger, linux-ext4, linux-kernel

On Fri, May 19, 2017 at 10:13:39AM +0300, Konstantin Khlebnikov wrote:
> ext4_expand_extra_isize() should clear only space between old and new size.
> 
> Signed-off-by: Konstantin Khlebnikov <khlebnikov@yandex-team.ru>

Thanks, applied.

					- Ted

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2017-05-21  3:07 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-05-19  7:13 [PATCH] ext4: keep existing extra fields when inode expands Konstantin Khlebnikov
2017-05-21  3:07 ` Theodore Ts'o

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox