btrfs: change error handling for btrfs_delete_*_in_log

Currently we will abort the transaction if we get a random error (like
-EIO) while trying to remove the directory entries from the root log
during rename.

However since these are simply log tree related errors, we can mark the
trans as needing a full commit.  Then if the error was truly
catastrophic we'll hit it during the normal commit and abort as
appropriate.

Reviewed-by: Nikolay Borisov <nborisov@suse.com>
Reviewed-by: Filipe Manana <fdmanana@suse.com>
Signed-off-by: Josef Bacik <josef@toxicpanda.com>
Signed-off-by: David Sterba <dsterba@suse.com>

diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c
index 28e0ad1478c3ff6740067c520b7771b5d55b0e6c..1e083ecd6951aa24af03e8be0f9e32bd4ba80033 100644 (file)
--- a/fs/btrfs/inode.c
+++ b/fs/btrfs/inode.c
@@ -4120,19 +4120,9 @@ skip_backref:
                goto err;
        }
 
-       ret = btrfs_del_inode_ref_in_log(trans, root, name, name_len, inode,
-                       dir_ino);
-       if (ret != 0 && ret != -ENOENT) {
-               btrfs_abort_transaction(trans, ret);
-               goto err;
-       }
-
-       ret = btrfs_del_dir_entries_in_log(trans, root, name, name_len, dir,
-                       index);
-       if (ret == -ENOENT)
-               ret = 0;
-       else if (ret)
-               btrfs_abort_transaction(trans, ret);
+       btrfs_del_inode_ref_in_log(trans, root, name, name_len, inode,
+                                  dir_ino);
+       btrfs_del_dir_entries_in_log(trans, root, name, name_len, dir, index);
 
        /*
         * If we have a pending delayed iput we could end up with the final iput

diff --git a/fs/btrfs/tree-log.c b/fs/btrfs/tree-log.c
index 9bfadce594332ab8b70d7b3f917cdac48fe31ed2..eb8b61decc717a77b8673b0b2e7c73d87f67c433 100644 (file)
--- a/fs/btrfs/tree-log.c
+++ b/fs/btrfs/tree-log.c
@@ -3518,10 +3518,10 @@ static bool inode_logged(struct btrfs_trans_handle *trans,
  * This optimizations allows us to avoid relogging the entire inode
  * or the entire directory.
  */
-int btrfs_del_dir_entries_in_log(struct btrfs_trans_handle *trans,
-                                struct btrfs_root *root,
-                                const char *name, int name_len,
-                                struct btrfs_inode *dir, u64 index)
+void btrfs_del_dir_entries_in_log(struct btrfs_trans_handle *trans,
+                                 struct btrfs_root *root,
+                                 const char *name, int name_len,
+                                 struct btrfs_inode *dir, u64 index)
 {
        struct btrfs_root *log;
        struct btrfs_dir_item *di;
@@ -3531,11 +3531,11 @@ int btrfs_del_dir_entries_in_log(struct btrfs_trans_handle *trans,
        u64 dir_ino = btrfs_ino(dir);
 
        if (!inode_logged(trans, dir))
-               return 0;
+               return;
 
        ret = join_running_log_trans(root);
        if (ret)
-               return 0;
+               return;
 
        mutex_lock(&dir->log_mutex);
 
@@ -3583,48 +3583,36 @@ fail:
        btrfs_free_path(path);
 out_unlock:
        mutex_unlock(&dir->log_mutex);
-       if (err == -ENOSPC) {
+       if (err < 0)
                btrfs_set_log_full_commit(trans);
-               err = 0;
-       } else if (err < 0) {
-               btrfs_abort_transaction(trans, err);
-       }
-
        btrfs_end_log_trans(root);
-
-       return err;
 }
 
 /* see comments for btrfs_del_dir_entries_in_log */
-int btrfs_del_inode_ref_in_log(struct btrfs_trans_handle *trans,
-                              struct btrfs_root *root,
-                              const char *name, int name_len,
-                              struct btrfs_inode *inode, u64 dirid)
+void btrfs_del_inode_ref_in_log(struct btrfs_trans_handle *trans,
+                               struct btrfs_root *root,
+                               const char *name, int name_len,
+                               struct btrfs_inode *inode, u64 dirid)
 {
        struct btrfs_root *log;
        u64 index;
        int ret;
 
        if (!inode_logged(trans, inode))
-               return 0;
+               return;
 
        ret = join_running_log_trans(root);
        if (ret)
-               return 0;
+               return;
        log = root->log_root;
        mutex_lock(&inode->log_mutex);
 
        ret = btrfs_del_inode_ref(trans, log, name, name_len, btrfs_ino(inode),
                                  dirid, &index);
        mutex_unlock(&inode->log_mutex);
-       if (ret == -ENOSPC) {
+       if (ret < 0 && ret != -ENOENT)
                btrfs_set_log_full_commit(trans);
-               ret = 0;
-       } else if (ret < 0 && ret != -ENOENT)
-               btrfs_abort_transaction(trans, ret);
        btrfs_end_log_trans(root);
-
-       return ret;
 }
 
 /*

diff --git a/fs/btrfs/tree-log.h b/fs/btrfs/tree-log.h
index 3ce6bdb760096a64c0e3b113c4553b0d830c2fb2..f6811c3df38a670544ee98166984d8d297a176f0 100644 (file)
--- a/fs/btrfs/tree-log.h
+++ b/fs/btrfs/tree-log.h
@@ -70,14 +70,14 @@ int btrfs_recover_log_trees(struct btrfs_root *tree_root);
 int btrfs_log_dentry_safe(struct btrfs_trans_handle *trans,
                          struct dentry *dentry,
                          struct btrfs_log_ctx *ctx);
-int btrfs_del_dir_entries_in_log(struct btrfs_trans_handle *trans,
-                                struct btrfs_root *root,
-                                const char *name, int name_len,
-                                struct btrfs_inode *dir, u64 index);
-int btrfs_del_inode_ref_in_log(struct btrfs_trans_handle *trans,
-                              struct btrfs_root *root,
-                              const char *name, int name_len,
-                              struct btrfs_inode *inode, u64 dirid);
+void btrfs_del_dir_entries_in_log(struct btrfs_trans_handle *trans,
+                                 struct btrfs_root *root,
+                                 const char *name, int name_len,
+                                 struct btrfs_inode *dir, u64 index);
+void btrfs_del_inode_ref_in_log(struct btrfs_trans_handle *trans,
+                               struct btrfs_root *root,
+                               const char *name, int name_len,
+                               struct btrfs_inode *inode, u64 dirid);
 void btrfs_end_log_trans(struct btrfs_root *root);
 void btrfs_pin_log_trans(struct btrfs_root *root);
 void btrfs_record_unlink_dir(struct btrfs_trans_handle *trans,