1 ext4: allow ext4_ext_truncate() to return an error
3 Return errors to the caller instead of declaring the file system
6 Signed-off-by: Theodore Ts'o <tytso@mit.edu>
7 Reviewed-by: Jan Kara <jack@suse.cz>
10 fs/ext4/extents.c | 15 +++++++--------
11 fs/ext4/inode.c | 4 +++-
12 3 files changed, 11 insertions(+), 10 deletions(-)
14 diff --git a/fs/ext4/ext4.h b/fs/ext4/ext4.h
15 index be2282dcde7d..54211c7876f8 100644
18 @@ -3128,7 +3128,7 @@ extern int ext4_ext_writepage_trans_blocks(struct inode *, int);
19 extern int ext4_ext_index_trans_blocks(struct inode *inode, int extents);
20 extern int ext4_ext_map_blocks(handle_t *handle, struct inode *inode,
21 struct ext4_map_blocks *map, int flags);
22 -extern void ext4_ext_truncate(handle_t *, struct inode *);
23 +extern int ext4_ext_truncate(handle_t *, struct inode *);
24 extern int ext4_ext_remove_space(struct inode *inode, ext4_lblk_t start,
26 extern void ext4_ext_init(struct super_block *);
27 diff --git a/fs/ext4/extents.c b/fs/ext4/extents.c
28 index c930a0110fb4..d3b119499c53 100644
29 --- a/fs/ext4/extents.c
30 +++ b/fs/ext4/extents.c
31 @@ -4631,7 +4631,7 @@ int ext4_ext_map_blocks(handle_t *handle, struct inode *inode,
32 return err ? err : allocated;
35 -void ext4_ext_truncate(handle_t *handle, struct inode *inode)
36 +int ext4_ext_truncate(handle_t *handle, struct inode *inode)
38 struct super_block *sb = inode->i_sb;
39 ext4_lblk_t last_block;
40 @@ -4645,7 +4645,9 @@ void ext4_ext_truncate(handle_t *handle, struct inode *inode)
42 /* we have to know where to truncate from in crash case */
43 EXT4_I(inode)->i_disksize = inode->i_size;
44 - ext4_mark_inode_dirty(handle, inode);
45 + err = ext4_mark_inode_dirty(handle, inode);
49 last_block = (inode->i_size + sb->s_blocksize - 1)
50 >> EXT4_BLOCK_SIZE_BITS(sb);
51 @@ -4657,12 +4659,9 @@ void ext4_ext_truncate(handle_t *handle, struct inode *inode)
52 congestion_wait(BLK_RW_ASYNC, HZ/50);
56 - ext4_std_error(inode->i_sb, err);
59 - err = ext4_ext_remove_space(inode, last_block, EXT_MAX_BLOCKS - 1);
60 - ext4_std_error(inode->i_sb, err);
63 + return ext4_ext_remove_space(inode, last_block, EXT_MAX_BLOCKS - 1);
66 static int ext4_alloc_file_blocks(struct file *file, ext4_lblk_t offset,
67 diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c
68 index 40ea090d2e0e..7f32899c9701 100644
71 @@ -4167,11 +4167,13 @@ int ext4_truncate(struct inode *inode)
72 ext4_discard_preallocations(inode);
74 if (ext4_test_inode_flag(inode, EXT4_INODE_EXTENTS))
75 - ext4_ext_truncate(handle, inode);
76 + err = ext4_ext_truncate(handle, inode);
78 ext4_ind_truncate(handle, inode);
80 up_write(&ei->i_data_sem);
85 ext4_handle_sync(handle);