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

Commit ae24f28d authored by Jan Kara's avatar Jan Kara Committed by Theodore Ts'o
Browse files

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: default avatarJan Kara <jack@suse.cz>
Signed-off-by: default avatar"Theodore Ts'o" <tytso@mit.edu>
parent 556b27ab

fs/ext4/file.c

+0 −1
Original line number Diff line number Diff line
@@ -272,7 +272,6 @@ const struct file_operations ext4_file_operations = { 
};



const struct inode_operations ext4_file_inode_operations = {

	.truncate	= ext4_truncate,

	.setattr	= ext4_setattr,

	.getattr	= ext4_getattr,

#ifdef CONFIG_EXT4_FS_XATTR

fs/ext4/inode.c

+1 −3
Original line number Diff line number Diff line
@@ -3511,7 +3511,7 @@ retry: 
			loff_t end = offset + iov_length(iov, nr_segs);



			if (end > isize)

				vmtruncate(inode, isize);

				ext4_truncate_failed_write(inode);

		}

	}

	if (ret == -ENOSPC && ext4_should_retry_alloc(inode->i_sb, &retries))
@@ -4407,8 +4407,6 @@ static void ext4_free_branches(handle_t *handle, struct inode *inode, 


int ext4_can_truncate(struct inode *inode)

{

	if (IS_APPEND(inode) || IS_IMMUTABLE(inode))

		return 0;

	if (S_ISREG(inode->i_mode))

		return 1;

	if (S_ISDIR(inode->i_mode))