ext4: propagate error values from ext4_inline_data_truncate()

Signed-off-by: Theodore Ts'o <tytso@mit.edu>

diff --git a/fs/ext4/ext4.h b/fs/ext4/ext4.h
index 6bcb9622fdf9febedf883ffe38bd1f24dc13bf76..1cd077e025174c5744d197893159915dd8b263a0 100644 (file)
--- a/fs/ext4/ext4.h
+++ b/fs/ext4/ext4.h
@@ -3023,7 +3023,7 @@ extern int ext4_inline_data_fiemap(struct inode *inode,
 extern int ext4_try_to_evict_inline_data(handle_t *handle,
                                         struct inode *inode,
                                         int needed);
-extern void ext4_inline_data_truncate(struct inode *inode, int *has_inline);
+extern int ext4_inline_data_truncate(struct inode *inode, int *has_inline);
 
 extern int ext4_convert_inline_data(struct inode *inode);
 

diff --git a/fs/ext4/inline.c b/fs/ext4/inline.c
index 31f98dd04e51abd6872c99cfb896f46a79357526..338cfd862adba55094a8707abfc7e22197e2e667 100644 (file)
--- a/fs/ext4/inline.c
+++ b/fs/ext4/inline.c
@@ -1896,10 +1896,10 @@ out:
        return error;
 }
 
-void ext4_inline_data_truncate(struct inode *inode, int *has_inline)
+int ext4_inline_data_truncate(struct inode *inode, int *has_inline)
 {
        handle_t *handle;
-       int inline_size, value_len, needed_blocks, no_expand;
+       int inline_size, value_len, needed_blocks, no_expand, err = 0;
        size_t i_size;
        void *value = NULL;
        struct ext4_xattr_ibody_find is = {
@@ -1914,19 +1914,19 @@ void ext4_inline_data_truncate(struct inode *inode, int *has_inline)
        needed_blocks = ext4_writepage_trans_blocks(inode);
        handle = ext4_journal_start(inode, EXT4_HT_INODE, needed_blocks);
        if (IS_ERR(handle))
-               return;
+               return PTR_ERR(handle);
 
        ext4_write_lock_xattr(inode, &no_expand);
        if (!ext4_has_inline_data(inode)) {
                *has_inline = 0;
                ext4_journal_stop(handle);
-               return;
+               return 0;
        }
 
-       if (ext4_orphan_add(handle, inode))
+       if ((err = ext4_orphan_add(handle, inode)) != 0)
                goto out;
 
-       if (ext4_get_inode_loc(inode, &is.iloc))
+       if ((err = ext4_get_inode_loc(inode, &is.iloc)) != 0)
                goto out;
 
        down_write(&EXT4_I(inode)->i_data_sem);
@@ -1937,24 +1937,29 @@ void ext4_inline_data_truncate(struct inode *inode, int *has_inline)
        if (i_size < inline_size) {
                /* Clear the content in the xattr space. */
                if (inline_size > EXT4_MIN_INLINE_DATA_SIZE) {
-                       if (ext4_xattr_ibody_find(inode, &i, &is))
+                       if ((err = ext4_xattr_ibody_find(inode, &i, &is)) != 0)
                                goto out_error;
 
                        BUG_ON(is.s.not_found);
 
                        value_len = le32_to_cpu(is.s.here->e_value_size);
                        value = kmalloc(value_len, GFP_NOFS);
-                       if (!value)
+                       if (!value) {
+                               err = -ENOMEM;
                                goto out_error;
+                       }
 
-                       if (ext4_xattr_ibody_get(inode, i.name_index, i.name,
-                                               value, value_len))
+                       err = ext4_xattr_ibody_get(inode, i.name_index,
+                                                  i.name, value, value_len);
+                       if (err <= 0)
                                goto out_error;
 
                        i.value = value;
                        i.value_len = i_size > EXT4_MIN_INLINE_DATA_SIZE ?
                                        i_size - EXT4_MIN_INLINE_DATA_SIZE : 0;
-                       if (ext4_xattr_ibody_inline_set(handle, inode, &i, &is))
+                       err = ext4_xattr_ibody_inline_set(handle, inode,
+                                                         &i, &is);
+                       if (err)
                                goto out_error;
                }
 
@@ -1979,13 +1984,14 @@ out:
        if (inode->i_nlink)
                ext4_orphan_del(handle, inode);
 
-       inode->i_mtime = inode->i_ctime = current_time(inode);
-       ext4_mark_inode_dirty(handle, inode);
-       if (IS_SYNC(inode))
-               ext4_handle_sync(handle);
-
+       if (err == 0) {
+               inode->i_mtime = inode->i_ctime = current_time(inode);
+               err = ext4_mark_inode_dirty(handle, inode);
+               if (IS_SYNC(inode))
+                       ext4_handle_sync(handle);
+       }
        ext4_journal_stop(handle);
-       return;
+       return err;
 }
 
 int ext4_convert_inline_data(struct inode *inode)

diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c
index 86dde0667ccc6d4bd4a31c2e8c9be3e938e23170..1e2c881f102df91a884f961198011c7f42882d02 100644 (file)
--- a/fs/ext4/inode.c
+++ b/fs/ext4/inode.c
@@ -4222,7 +4222,9 @@ int ext4_truncate(struct inode *inode)
        if (ext4_has_inline_data(inode)) {
                int has_inline = 1;
 
-               ext4_inline_data_truncate(inode, &has_inline);
+               err = ext4_inline_data_truncate(inode, &has_inline);
+               if (err)
+                       return err;
                if (has_inline)
                        return 0;
        }