Skip to contentSkip to conversation

f2fs: convert inline_data in prior to i_size_write

PATCH In review Jaegeuk Kim 3 participants 7 messages Aug 30, 2019 – Sep 3, 2019 F2FS file system

lore
Share & tools
lore

Jaegeuk Kim

author maintainer
#0 lore raw

PATCH 1/1 f2fs: convert inline_data in prior to i_size_write

This can guarantee inline_data has smaller i_size.

---
 fs/f2fs/file.c | 25 +++++++++----------------
 1 file changed, 9 insertions(+), 16 deletions(-)
fs/f2fs/file.c +9 -16
index 08caaead6f16..a43193dd27cb 100644
@@ -815,14 +815,20 @@ int f2fs_setattr(struct dentry *dentry, struct iattr *attr)
 
 	if (attr->ia_valid & ATTR_SIZE) {
 		loff_t old_size = i_size_read(inode);
-		bool to_smaller = (attr->ia_size <= old_size);
+
+		if (attr->ia_size > MAX_INLINE_DATA(inode)) {
+			/* should convert inline inode here */
+			err = f2fs_convert_inline_inode(inode);
+			if (err)
+				return err;
+		}
 
 		down_write(&F2FS_I(inode)->i_gc_rwsem[WRITE]);
 		down_write(&F2FS_I(inode)->i_mmap_sem);
 
 		truncate_setsize(inode, attr->ia_size);
 
-		if (to_smaller)
+		if (attr->ia_size <= old_size)
 			err = f2fs_truncate(inode);
 		/*
 		 * do not trim all blocks after i_size if target size is
@@ -830,24 +836,11 @@ int f2fs_setattr(struct dentry *dentry, struct iattr *attr)
 		 */
 		up_write(&F2FS_I(inode)->i_mmap_sem);
 		up_write(&F2FS_I(inode)->i_gc_rwsem[WRITE]);
-
 		if (err)
 			return err;
 
-		if (!to_smaller) {
-			/* should convert inline inode here */
-			if (!f2fs_may_inline_data(inode)) {
-				err = f2fs_convert_inline_inode(inode);
-				if (err) {
-					/* recover old i_size */
-					i_size_write(inode, old_size);
-					return err;
-				}
-			}
-			inode->i_mtime = inode->i_ctime = current_time(inode);
-		}
-
 		down_write(&F2FS_I(inode)->i_sem);
+		inode->i_mtime = inode->i_ctime = current_time(inode);
 		F2FS_I(inode)->last_disk_size = i_size_read(inode);
 		up_write(&F2FS_I(inode)->i_sem);
 	}
Signature · 1 line
2.19.0.605.g01d371f741-goog
Reviewed-by on v1 1/1
#1 lore raw
Quoted 1 line · Jaegeuk Kim

This can guarantee inline_data has smaller i_size.

So I guess "f2fs: fix to avoid corruption during inline conversion" didn't fix such corruption right, I guess checkpoint & SPO before i_size recovery will cause this issue?

	err = f2fs_convert_inline_inode(inode);
	if (err) {

-->

		/* recover old i_size */
		i_size_write(inode, old_size);
		return err;
Quoted 2 lines
Quoted 9 lines
---
 fs/f2fs/file.c | 25 +++++++++----------------
 1 file changed, 9 insertions(+), 16 deletions(-)
fs/f2fs/file.c +0 -0
index 08caaead6f16..a43193dd27cb 100644

fs/f2fs/file.c int f2fs_setattr(struct dentry *dentry, struct iattr *attr) · line 820

Quoted 7 lines
fs/f2fs/file.c +3 -1
@@ -815,14 +815,20 @@ int f2fs_setattr(struct dentry *dentry, struct iattr *attr)
 
 	if (attr->ia_valid & ATTR_SIZE) {
 		loff_t old_size = i_size_read(inode);
-		bool to_smaller = (attr->ia_size <= old_size);
+
+		if (attr->ia_size > MAX_INLINE_DATA(inode)) {
+			/* should convert inline inode here */

Would it be better:

/* should convert inline inode here in piror to i_size_write to avoid inconsistent status in between inline flag and i_size */

Thanks,

Quoted 42 lines
fs/f2fs/file.c +6 -15
+			err = f2fs_convert_inline_inode(inode);
+			if (err)
+				return err;
+		}
 
 		down_write(&F2FS_I(inode)->i_gc_rwsem[WRITE]);
 		down_write(&F2FS_I(inode)->i_mmap_sem);
 
 		truncate_setsize(inode, attr->ia_size);
 
-		if (to_smaller)
+		if (attr->ia_size <= old_size)
 			err = f2fs_truncate(inode);
 		/*
 		 * do not trim all blocks after i_size if target size is
@@ -830,24 +836,11 @@ int f2fs_setattr(struct dentry *dentry, struct iattr *attr)
 		 */
 		up_write(&F2FS_I(inode)->i_mmap_sem);
 		up_write(&F2FS_I(inode)->i_gc_rwsem[WRITE]);
-
 		if (err)
 			return err;
 
-		if (!to_smaller) {
-			/* should convert inline inode here */
-			if (!f2fs_may_inline_data(inode)) {
-				err = f2fs_convert_inline_inode(inode);
-				if (err) {
-					/* recover old i_size */
-					i_size_write(inode, old_size);
-					return err;
-				}
-			}
-			inode->i_mtime = inode->i_ctime = current_time(inode);
-		}
-
 		down_write(&F2FS_I(inode)->i_sem);
+		inode->i_mtime = inode->i_ctime = current_time(inode);
 		F2FS_I(inode)->last_disk_size = i_size_read(inode);
 		up_write(&F2FS_I(inode)->i_sem);
 	}
author maintainer
#2 lore raw
Quoted 11 lines · Chao Yu
Quoted 1 line · Jaegeuk Kim

This can guarantee inline_data has smaller i_size.

So I guess "f2fs: fix to avoid corruption during inline conversion" didn't fix such corruption right, I guess checkpoint & SPO before i_size recovery will cause this issue?

	err = f2fs_convert_inline_inode(inode);
	if (err) {

-->

Yup, I think so.

Quoted 29 lines
		/* recover old i_size */
		i_size_write(inode, old_size);
		return err;
Quoted 2 lines
Quoted 9 lines
---
 fs/f2fs/file.c | 25 +++++++++----------------
 1 file changed, 9 insertions(+), 16 deletions(-)
fs/f2fs/file.c +0 -0
index 08caaead6f16..a43193dd27cb 100644

fs/f2fs/file.c int f2fs_setattr(struct dentry *dentry, struct iattr *attr) · line 820

Quoted 7 lines
fs/f2fs/file.c +3 -1
@@ -815,14 +815,20 @@ int f2fs_setattr(struct dentry *dentry, struct iattr *attr)
 
 	if (attr->ia_valid & ATTR_SIZE) {
 		loff_t old_size = i_size_read(inode);
-		bool to_smaller = (attr->ia_size <= old_size);
+
+		if (attr->ia_size > MAX_INLINE_DATA(inode)) {
+			/* should convert inline inode here */

Would it be better:

Quoted 2 lines

/* should convert inline inode here in piror to i_size_write to avoid inconsistent status in between inline flag and i_size */

Put like this.

+ /*

+                        * should convert inline inode before i_size_write to
+                        * keep smaller than inline_data size with inline flag.
+                        */
Quoted 37 lines

Thanks,

Quoted 34 lines
fs/f2fs/file.c +5 -13
+			err = f2fs_convert_inline_inode(inode);
+			if (err)
+				return err;
+		}
 
 		down_write(&F2FS_I(inode)->i_gc_rwsem[WRITE]);
 		down_write(&F2FS_I(inode)->i_mmap_sem);
 
 		truncate_setsize(inode, attr->ia_size);
 
-		if (to_smaller)
+		if (attr->ia_size <= old_size)
 			err = f2fs_truncate(inode);
 		/*
 		 * do not trim all blocks after i_size if target size is
@@ -830,24 +836,11 @@ int f2fs_setattr(struct dentry *dentry, struct iattr *attr)
 		 */
 		up_write(&F2FS_I(inode)->i_mmap_sem);
 		up_write(&F2FS_I(inode)->i_gc_rwsem[WRITE]);
-
 		if (err)
 			return err;
 
-		if (!to_smaller) {
-			/* should convert inline inode here */
-			if (!f2fs_may_inline_data(inode)) {
-				err = f2fs_convert_inline_inode(inode);
-				if (err) {
-					/* recover old i_size */
-					i_size_write(inode, old_size);
-					return err;
-				}
-			}
-			inode->i_mtime = inode->i_ctime = current_time(inode);
Quoted 8 lines

fs/f2fs/file.c int f2fs_setattr(struct dentry *dentry, struct iattr *attr) · line 846

Quoted 8 lines
fs/f2fs/file.c +1 -2
-		}
-
 		down_write(&F2FS_I(inode)->i_sem);
+		inode->i_mtime = inode->i_ctime = current_time(inode);
 		F2FS_I(inode)->last_disk_size = i_size_read(inode);
 		up_write(&F2FS_I(inode)->i_sem);
 	}

_______________________________________________
Linux-f2fs-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel

#3 lore raw
Quoted 8 lines · Jaegeuk Kim
Quoted 7 lines · Chao Yu
Quoted 1 line · Jaegeuk Kim

This can guarantee inline_data has smaller i_size.

So I guess "f2fs: fix to avoid corruption during inline conversion" didn't fix such corruption right, I guess checkpoint & SPO before i_size recovery will cause this issue?

Quoted 6 lines
Quoted 4 lines
	err = f2fs_convert_inline_inode(inode);
	if (err) {

-->

Yup, I think so.

Oh, we'd better to avoid wrong fixing patch as much as possible, so what about letting me change that patch to just fix error path of f2fs_convert_inline_page() by adding missing f2fs_truncate_data_blocks_range()?

Meanwhile I need to add below 'Fixes' tag line:
7735730d39d7 ("f2fs: fix to propagate error from __get_meta_page()")

And if possible, could you add:

In below call path, if we failed to convert inline inode, inline inode may have wrong i_size which is larger than max inline size.
- f2fs_setattr
- truncate_setsize
- f2fs_convert_inline_inode

Fixes 0cab80ee0c9e ("f2fs: fix to convert inline inode in ->setattr")
Quoted 35 lines
Quoted 30 lines

		/* recover old i_size */
		i_size_write(inode, old_size);
		return err;
Quoted 2 lines
Quoted 9 lines
---
 fs/f2fs/file.c | 25 +++++++++----------------
 1 file changed, 9 insertions(+), 16 deletions(-)
fs/f2fs/file.c +0 -0
index 08caaead6f16..a43193dd27cb 100644

fs/f2fs/file.c int f2fs_setattr(struct dentry *dentry, struct iattr *attr) · line 820

Quoted 7 lines
fs/f2fs/file.c +3 -1
@@ -815,14 +815,20 @@ int f2fs_setattr(struct dentry *dentry, struct iattr *attr)
 
 	if (attr->ia_valid & ATTR_SIZE) {
 		loff_t old_size = i_size_read(inode);
-		bool to_smaller = (attr->ia_size <= old_size);
+
+		if (attr->ia_size > MAX_INLINE_DATA(inode)) {
+			/* should convert inline inode here */

Would it be better:

Quoted 2 lines

/* should convert inline inode here in piror to i_size_write to avoid inconsistent status in between inline flag and i_size */

Put like this.

Review

Quoted 4 lines
(quoted diff) +4 -0
+                       /*
+                        * should convert inline inode before i_size_write to
+                        * keep smaller than inline_data size with inline flag.
+                        */

Better, :)

thanks,

Quoted 48 lines
Quoted 38 lines

Thanks,

Quoted 34 lines
fs/f2fs/file.c +5 -13
+			err = f2fs_convert_inline_inode(inode);
+			if (err)
+				return err;
+		}
 
 		down_write(&F2FS_I(inode)->i_gc_rwsem[WRITE]);
 		down_write(&F2FS_I(inode)->i_mmap_sem);
 
 		truncate_setsize(inode, attr->ia_size);
 
-		if (to_smaller)
+		if (attr->ia_size <= old_size)
 			err = f2fs_truncate(inode);
 		/*
 		 * do not trim all blocks after i_size if target size is
@@ -830,24 +836,11 @@ int f2fs_setattr(struct dentry *dentry, struct iattr *attr)
 		 */
 		up_write(&F2FS_I(inode)->i_mmap_sem);
 		up_write(&F2FS_I(inode)->i_gc_rwsem[WRITE]);
-
 		if (err)
 			return err;
 
-		if (!to_smaller) {
-			/* should convert inline inode here */
-			if (!f2fs_may_inline_data(inode)) {
-				err = f2fs_convert_inline_inode(inode);
-				if (err) {
-					/* recover old i_size */
-					i_size_write(inode, old_size);
-					return err;
-				}
-			}
-			inode->i_mtime = inode->i_ctime = current_time(inode);
Quoted 8 lines

fs/f2fs/file.c int f2fs_setattr(struct dentry *dentry, struct iattr *attr) · line 846

Quoted 8 lines
fs/f2fs/file.c +1 -2
-		}
-
 		down_write(&F2FS_I(inode)->i_sem);
+		inode->i_mtime = inode->i_ctime = current_time(inode);
 		F2FS_I(inode)->last_disk_size = i_size_read(inode);
 		up_write(&F2FS_I(inode)->i_sem);
 	}

.

author maintainer
#4 lore raw
Quoted 12 lines · Chao Yu
Quoted 11 lines · Jaegeuk Kim
Quoted 10 lines · Chao Yu
Quoted 1 line · Jaegeuk Kim

This can guarantee inline_data has smaller i_size.

So I guess "f2fs: fix to avoid corruption during inline conversion" didn't fix such corruption right, I guess checkpoint & SPO before i_size recovery will cause this issue?

	err = f2fs_convert_inline_inode(inode);
	if (err) {
Quoted 7 lines
Quoted 3 lines
Quoted 1 line

-->

Yup, I think so.

Oh, we'd better to avoid wrong fixing patch as much as possible, so what about letting me change that patch to just fix error path of f2fs_convert_inline_page() by adding missing f2fs_truncate_data_blocks_range()?

Could you post another patch? I'm okay to combine them.

Quoted 107 lines

Meanwhile I need to add below 'Fixes' tag line:
7735730d39d7 ("f2fs: fix to propagate error from __get_meta_page()")

And if possible, could you add:

In below call path, if we failed to convert inline inode, inline inode may have wrong i_size which is larger than max inline size.
- f2fs_setattr
- truncate_setsize
- f2fs_convert_inline_inode

Fixes 0cab80ee0c9e ("f2fs: fix to convert inline inode in ->setattr")
Quoted 35 lines
Quoted 30 lines

		/* recover old i_size */
		i_size_write(inode, old_size);
		return err;
Quoted 2 lines
Quoted 9 lines
---
 fs/f2fs/file.c | 25 +++++++++----------------
 1 file changed, 9 insertions(+), 16 deletions(-)
fs/f2fs/file.c +0 -0
index 08caaead6f16..a43193dd27cb 100644

fs/f2fs/file.c int f2fs_setattr(struct dentry *dentry, struct iattr *attr) · line 820

Quoted 7 lines
fs/f2fs/file.c +3 -1
@@ -815,14 +815,20 @@ int f2fs_setattr(struct dentry *dentry, struct iattr *attr)
 
 	if (attr->ia_valid & ATTR_SIZE) {
 		loff_t old_size = i_size_read(inode);
-		bool to_smaller = (attr->ia_size <= old_size);
+
+		if (attr->ia_size > MAX_INLINE_DATA(inode)) {
+			/* should convert inline inode here */

Would it be better:

Quoted 2 lines

/* should convert inline inode here in piror to i_size_write to avoid inconsistent status in between inline flag and i_size */

Put like this.

Review

Quoted 4 lines
(quoted diff) +4 -0
+                       /*
+                        * should convert inline inode before i_size_write to
+                        * keep smaller than inline_data size with inline flag.
+                        */

Better, :)

thanks,

Quoted 48 lines
Quoted 38 lines

Thanks,

Quoted 34 lines
fs/f2fs/file.c +5 -13
+			err = f2fs_convert_inline_inode(inode);
+			if (err)
+				return err;
+		}
 
 		down_write(&F2FS_I(inode)->i_gc_rwsem[WRITE]);
 		down_write(&F2FS_I(inode)->i_mmap_sem);
 
 		truncate_setsize(inode, attr->ia_size);
 
-		if (to_smaller)
+		if (attr->ia_size <= old_size)
 			err = f2fs_truncate(inode);
 		/*
 		 * do not trim all blocks after i_size if target size is
@@ -830,24 +836,11 @@ int f2fs_setattr(struct dentry *dentry, struct iattr *attr)
 		 */
 		up_write(&F2FS_I(inode)->i_mmap_sem);
 		up_write(&F2FS_I(inode)->i_gc_rwsem[WRITE]);
-
 		if (err)
 			return err;
 
-		if (!to_smaller) {
-			/* should convert inline inode here */
-			if (!f2fs_may_inline_data(inode)) {
-				err = f2fs_convert_inline_inode(inode);
-				if (err) {
-					/* recover old i_size */
-					i_size_write(inode, old_size);
-					return err;
-				}
-			}
-			inode->i_mtime = inode->i_ctime = current_time(inode);
Quoted 8 lines

fs/f2fs/file.c int f2fs_setattr(struct dentry *dentry, struct iattr *attr) · line 846

Quoted 8 lines
fs/f2fs/file.c +1 -2
-		}
-
 		down_write(&F2FS_I(inode)->i_sem);
+		inode->i_mtime = inode->i_ctime = current_time(inode);
 		F2FS_I(inode)->last_disk_size = i_size_read(inode);
 		up_write(&F2FS_I(inode)->i_sem);
 	}

.

maintainer
#5 lore raw
Quoted 15 lines · Jaegeuk Kim
Quoted 14 lines · Chao Yu
Quoted 13 lines · Jaegeuk Kim
Quoted 11 lines · Chao Yu
Quoted 1 line · Jaegeuk Kim

This can guarantee inline_data has smaller i_size.

So I guess "f2fs: fix to avoid corruption during inline conversion" didn't fix such corruption right, I guess checkpoint & SPO before i_size recovery will cause this issue?

	err = f2fs_convert_inline_inode(inode);
	if (err) {

-->

Quoted 7 lines
Quoted 5 lines
Quoted 1 line

Yup, I think so.

Oh, we'd better to avoid wrong fixing patch as much as possible, so what about letting me change that patch to just fix error path of f2fs_convert_inline_page() by adding missing f2fs_truncate_data_blocks_range()?

Could you post another patch? I'm okay to combine them.

No problem, let merge them in v2. :)

Thanks,

Quoted 115 lines
Quoted 51 lines

Meanwhile I need to add below 'Fixes' tag line:
7735730d39d7 ("f2fs: fix to propagate error from __get_meta_page()")

And if possible, could you add:

In below call path, if we failed to convert inline inode, inline inode may have wrong i_size which is larger than max inline size.
- f2fs_setattr
- truncate_setsize
- f2fs_convert_inline_inode

Fixes 0cab80ee0c9e ("f2fs: fix to convert inline inode in ->setattr")
Quoted 35 lines
Quoted 30 lines

		/* recover old i_size */
		i_size_write(inode, old_size);
		return err;
Quoted 2 lines
Quoted 9 lines
---
 fs/f2fs/file.c | 25 +++++++++----------------
 1 file changed, 9 insertions(+), 16 deletions(-)
fs/f2fs/file.c +0 -0
index 08caaead6f16..a43193dd27cb 100644

fs/f2fs/file.c int f2fs_setattr(struct dentry *dentry, struct iattr *attr) · line 820

Quoted 7 lines
fs/f2fs/file.c +3 -1
@@ -815,14 +815,20 @@ int f2fs_setattr(struct dentry *dentry, struct iattr *attr)
 
 	if (attr->ia_valid & ATTR_SIZE) {
 		loff_t old_size = i_size_read(inode);
-		bool to_smaller = (attr->ia_size <= old_size);
+
+		if (attr->ia_size > MAX_INLINE_DATA(inode)) {
+			/* should convert inline inode here */

Would it be better:

Quoted 2 lines

/* should convert inline inode here in piror to i_size_write to avoid inconsistent status in between inline flag and i_size */

Put like this.

Quoted 57 lines

Review

Quoted 4 lines
(quoted diff) +4 -0
+                       /*
+                        * should convert inline inode before i_size_write to
+                        * keep smaller than inline_data size with inline flag.
+                        */

Better, :)

thanks,

Quoted 48 lines
Quoted 38 lines

Thanks,

Quoted 34 lines
fs/f2fs/file.c +5 -13
+			err = f2fs_convert_inline_inode(inode);
+			if (err)
+				return err;
+		}
 
 		down_write(&F2FS_I(inode)->i_gc_rwsem[WRITE]);
 		down_write(&F2FS_I(inode)->i_mmap_sem);
 
 		truncate_setsize(inode, attr->ia_size);
 
-		if (to_smaller)
+		if (attr->ia_size <= old_size)
 			err = f2fs_truncate(inode);
 		/*
 		 * do not trim all blocks after i_size if target size is
@@ -830,24 +836,11 @@ int f2fs_setattr(struct dentry *dentry, struct iattr *attr)
 		 */
 		up_write(&F2FS_I(inode)->i_mmap_sem);
 		up_write(&F2FS_I(inode)->i_gc_rwsem[WRITE]);
-
 		if (err)
 			return err;
 
-		if (!to_smaller) {
-			/* should convert inline inode here */
-			if (!f2fs_may_inline_data(inode)) {
-				err = f2fs_convert_inline_inode(inode);
-				if (err) {
-					/* recover old i_size */
-					i_size_write(inode, old_size);
-					return err;
-				}
-			}
-			inode->i_mtime = inode->i_ctime = current_time(inode);
Quoted 8 lines

fs/f2fs/file.c int f2fs_setattr(struct dentry *dentry, struct iattr *attr) · line 846

Quoted 8 lines
fs/f2fs/file.c +1 -2
-		}
-
 		down_write(&F2FS_I(inode)->i_sem);
+		inode->i_mtime = inode->i_ctime = current_time(inode);
 		F2FS_I(inode)->last_disk_size = i_size_read(inode);
 		up_write(&F2FS_I(inode)->i_sem);
 	}

.

_______________________________________________
Linux-f2fs-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel

#6 lore raw
Quoted 18 lines · Chao Yu
Quoted 17 lines · Jaegeuk Kim
Quoted 16 lines · Chao Yu
Quoted 14 lines · Jaegeuk Kim
Quoted 11 lines · Chao Yu
Quoted 1 line · Jaegeuk Kim

This can guarantee inline_data has smaller i_size.

So I guess "f2fs: fix to avoid corruption during inline conversion" didn't fix such corruption right, I guess checkpoint & SPO before i_size recovery will cause this issue?

	err = f2fs_convert_inline_inode(inode);
	if (err) {

-->

Yup, I think so.

Quoted 7 lines
Quoted 5 lines
Quoted 3 lines

Oh, we'd better to avoid wrong fixing patch as much as possible, so what about letting me change that patch to just fix error path of f2fs_convert_inline_page() by adding missing f2fs_truncate_data_blocks_range()?

Could you post another patch? I'm okay to combine them.

No problem, let merge them in v2. :)

Still send as two separated patches which can be easily maintained in those LTS stable kernel. :P

Thanks,

Quoted 120 lines

Thanks,

Quoted 110 lines
Quoted 51 lines

Meanwhile I need to add below 'Fixes' tag line:
7735730d39d7 ("f2fs: fix to propagate error from __get_meta_page()")

And if possible, could you add:

In below call path, if we failed to convert inline inode, inline inode may have wrong i_size which is larger than max inline size.
- f2fs_setattr
- truncate_setsize
- f2fs_convert_inline_inode

Fixes 0cab80ee0c9e ("f2fs: fix to convert inline inode in ->setattr")
Quoted 35 lines
Quoted 30 lines

		/* recover old i_size */
		i_size_write(inode, old_size);
		return err;
Quoted 2 lines
Quoted 9 lines
---
 fs/f2fs/file.c | 25 +++++++++----------------
 1 file changed, 9 insertions(+), 16 deletions(-)
fs/f2fs/file.c +0 -0
index 08caaead6f16..a43193dd27cb 100644

fs/f2fs/file.c int f2fs_setattr(struct dentry *dentry, struct iattr *attr) · line 820

Quoted 7 lines
fs/f2fs/file.c +3 -1
@@ -815,14 +815,20 @@ int f2fs_setattr(struct dentry *dentry, struct iattr *attr)
 
 	if (attr->ia_valid & ATTR_SIZE) {
 		loff_t old_size = i_size_read(inode);
-		bool to_smaller = (attr->ia_size <= old_size);
+
+		if (attr->ia_size > MAX_INLINE_DATA(inode)) {
+			/* should convert inline inode here */

Would it be better:

Quoted 2 lines

/* should convert inline inode here in piror to i_size_write to avoid inconsistent status in between inline flag and i_size */

Put like this.

Quoted 57 lines

Review

Quoted 4 lines
(quoted diff) +4 -0
+                       /*
+                        * should convert inline inode before i_size_write to
+                        * keep smaller than inline_data size with inline flag.
+                        */

Better, :)

thanks,

Quoted 48 lines
Quoted 38 lines

Thanks,

Quoted 34 lines
fs/f2fs/file.c +5 -13
+			err = f2fs_convert_inline_inode(inode);
+			if (err)
+				return err;
+		}
 
 		down_write(&F2FS_I(inode)->i_gc_rwsem[WRITE]);
 		down_write(&F2FS_I(inode)->i_mmap_sem);
 
 		truncate_setsize(inode, attr->ia_size);
 
-		if (to_smaller)
+		if (attr->ia_size <= old_size)
 			err = f2fs_truncate(inode);
 		/*
 		 * do not trim all blocks after i_size if target size is
@@ -830,24 +836,11 @@ int f2fs_setattr(struct dentry *dentry, struct iattr *attr)
 		 */
 		up_write(&F2FS_I(inode)->i_mmap_sem);
 		up_write(&F2FS_I(inode)->i_gc_rwsem[WRITE]);
-
 		if (err)
 			return err;
 
-		if (!to_smaller) {
-			/* should convert inline inode here */
-			if (!f2fs_may_inline_data(inode)) {
-				err = f2fs_convert_inline_inode(inode);
-				if (err) {
-					/* recover old i_size */
-					i_size_write(inode, old_size);
-					return err;
-				}
-			}
-			inode->i_mtime = inode->i_ctime = current_time(inode);
Quoted 8 lines

fs/f2fs/file.c int f2fs_setattr(struct dentry *dentry, struct iattr *attr) · line 846

Quoted 8 lines
fs/f2fs/file.c +1 -2
-		}
-
 		down_write(&F2FS_I(inode)->i_sem);
+		inode->i_mtime = inode->i_ctime = current_time(inode);
 		F2FS_I(inode)->last_disk_size = i_size_read(inode);
 		up_write(&F2FS_I(inode)->i_sem);
 	}

.

Quoted 5 lines

_______________________________________________
Linux-f2fs-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel

.