Btrfs: delete dead code in btrfs_orphan_add()

btrfs_orphan_add() has had this case commented out since it was first
introduced in commit d68fc57b7e32 ("Btrfs: Metadata reservation for
orphan inodes"). Most of the orphan cleanup code has been rewritten
since then, so it's safe to say that this code isn't needed.

Signed-off-by: Omar Sandoval <osandov@fb.com>
Reviewed-by: Nikolay Borisov <nborisov@suse.com>
[ switch to bool ]
Signed-off-by: David Sterba <dsterba@suse.com>

diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c
index 1a83b71685d1ab173eed816f41cd51516fe717b9..a9a47387e53f485be7f5b2403bc38b2a1ff39d50 100644 (file)
--- a/fs/btrfs/inode.c
+++ b/fs/btrfs/inode.c
@@ -3366,7 +3366,7 @@ int btrfs_orphan_add(struct btrfs_trans_handle *trans,
        struct btrfs_root *root = inode->root;
        struct btrfs_block_rsv *block_rsv = NULL;
        int reserve = 0;
-       int insert = 0;
+       bool insert = false;
        int ret;
 
        if (!root->orphan_block_rsv) {
@@ -3377,20 +3377,8 @@ int btrfs_orphan_add(struct btrfs_trans_handle *trans,
        }
 
        if (!test_and_set_bit(BTRFS_INODE_HAS_ORPHAN_ITEM,
-                             &inode->runtime_flags)) {
-#if 0
-               /*
-                * For proper ENOSPC handling, we should do orphan
-                * cleanup when mounting. But this introduces backward
-                * compatibility issue.
-                */
-               if (!xchg(&root->orphan_item_inserted, 1))
-                       insert = 2;
-               else
-                       insert = 1;
-#endif
-               insert = 1;
-       }
+                             &inode->runtime_flags))
+               insert = true;
 
        if (!test_and_set_bit(BTRFS_INODE_ORPHAN_META_RESERVED,
                              &inode->runtime_flags))
@@ -3430,7 +3418,7 @@ int btrfs_orphan_add(struct btrfs_trans_handle *trans,
        }
 
        /* insert an orphan item to track this unlinked/truncated file */
-       if (insert >= 1) {
+       if (insert) {
                ret = btrfs_insert_orphan_item(trans, root, btrfs_ino(inode));
                if (ret) {
                        if (reserve) {
@@ -3454,15 +3442,6 @@ int btrfs_orphan_add(struct btrfs_trans_handle *trans,
                ret = 0;
        }
 
-       /* insert an orphan item to track subvolume contains orphan files */
-       if (insert >= 2) {
-               ret = btrfs_insert_orphan_item(trans, fs_info->tree_root,
-                                              root->root_key.objectid);
-               if (ret && ret != -EEXIST) {
-                       btrfs_abort_transaction(trans, ret);
-                       return ret;
-               }
-       }
        return 0;
 }