Eric Lee / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit ae24f28d39610a4810c78185cf599a771cf6ee1f

Authored by Jan Kara
Committed by Theodore Ts'o
1 parent 556b27abf7
Exists in master and in 39 other branches 8mp-imx_5.4.70_2.3.0, 8qm-imx_5.4.70_2.3.0, emb_imx_lf-5.15.y, emb_lf-6.1.y, imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, imx_4.1.15_1.0.0_ga, pitx_8mp_lf-5.10.y, rt-smarc-imx_4.1.15_1.0.0_ga, rt_linux_5.15.71, smarc-8m-android-11.0.0_2.0.0, smarc-imx6_4.14.98_2.0.0_ga, smarc-imx6_4.9.88_2.0.0_ga, smarc-imx7_4.14.98_2.0.0_ga, smarc-imx7_4.9.11_1.0.0_ga, smarc-imx7_4.9.88_2.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-imx_4.1.15_1.0.0_ga, smarc-imx_4.9.11_1.0.0_ga, smarc-imx_4.9.51_imx8m_ga, smarc-imx_4.9.88_2.0.0_ga, smarc-m6.0.1_2.1.0-ga, smarc-n7.1.2_2.0.0-ga, smarc-rel_imx_4.1.15_1.2.0_ga, smarc_8m_00d0_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.14.78_1.0.0_ga, smarc_8m_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.19.35_1.1.0, smarc_8mm_imx_4.14.78_1.0.0_ga, smarc_8mm_imx_4.14.98_2.0.0_ga, smarc_8mm_imx_4.19.35_1.1.0, smarc_8mm_imx_5.4.24_2.1.0, smarc_8mp_lf-5.10.y, smarc_8mq_imx_5.4.24_2.1.0, smarc_8mq_lf-5.10.y, smarc_imx_lf-5.15.y

ext4: Convert ext4 to new truncate calling convention 

Trivial conversion.  Fixup one error handling case calling vmtruncate()
and remove ->truncate callback. We also fix a bug that IS_IMMUTABLE and
IS_APPEND files could not be truncated during failed writes. In fact, the
test can be completely removed as upper layers do necessary permission
checks for truncate in do_sys_[f]truncate() and may_open() anyway.

Signed-off-by: Jan Kara <jack@suse.cz>
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>

Showing 2 changed files with 1 additions and 4 deletions Side-by-side Diff

... ... @@ -272,7 +272,6 @@
272 272 };
273 273  
274 274 const struct inode_operations ext4_file_inode_operations = {
275   - .truncate = ext4_truncate,
276 275 .setattr = ext4_setattr,
277 276 .getattr = ext4_getattr,
278 277 #ifdef CONFIG_EXT4_FS_XATTR
... ... @@ -3511,7 +3511,7 @@
3511 3511 loff_t end = offset + iov_length(iov, nr_segs);
3512 3512  
3513 3513 if (end > isize)
3514   - vmtruncate(inode, isize);
  3514 + ext4_truncate_failed_write(inode);
3515 3515 }
3516 3516 }
3517 3517 if (ret == -ENOSPC && ext4_should_retry_alloc(inode->i_sb, &retries))
... ... @@ -4407,8 +4407,6 @@
4407 4407  
4408 4408 int ext4_can_truncate(struct inode *inode)
4409 4409 {
4410   - if (IS_APPEND(inode) || IS_IMMUTABLE(inode))
4411   - return 0;
4412 4410 if (S_ISREG(inode->i_mode))
4413 4411 return 1;
4414 4412 if (S_ISDIR(inode->i_mode))