cxgb4vf: convert to use DEFINE_SEQ_ATTRIBUTE macro

[tomoyo/tomoyo-test1.git] / fs / btrfs / root-tree.c

diff --git a/fs/btrfs/root-tree.c b/fs/btrfs/root-tree.c
index 668f228..c896974 100644 (file)
--- a/fs/btrfs/root-tree.c
+++ b/fs/btrfs/root-tree.c
@@ -210,7 +210,6 @@ int btrfs_find_orphan_roots(struct btrfs_fs_info *fs_info)
        struct extent_buffer *leaf;
        struct btrfs_path *path;
        struct btrfs_key key;
-       struct btrfs_key root_key;
        struct btrfs_root *root;
        int err = 0;
        int ret;
@@ -223,10 +222,9 @@ int btrfs_find_orphan_roots(struct btrfs_fs_info *fs_info)
        key.type = BTRFS_ORPHAN_ITEM_KEY;
        key.offset = 0;
 
-       root_key.type = BTRFS_ROOT_ITEM_KEY;
-       root_key.offset = (u64)-1;
-
        while (1) {
+               u64 root_objectid;
+
                ret = btrfs_search_slot(NULL, tree_root, &key, path, 0, 0);
                if (ret < 0) {
                        err = ret;
@@ -250,10 +248,10 @@ int btrfs_find_orphan_roots(struct btrfs_fs_info *fs_info)
                    key.type != BTRFS_ORPHAN_ITEM_KEY)
                        break;
 
-               root_key.objectid = key.offset;
+               root_objectid = key.offset;
                key.offset++;
 
-               root = btrfs_get_fs_root(fs_info, &root_key, false);
+               root = btrfs_get_fs_root(fs_info, root_objectid, false);
                err = PTR_ERR_OR_ZERO(root);
                if (err && err != -ENOENT) {
                        break;
@@ -270,7 +268,7 @@ int btrfs_find_orphan_roots(struct btrfs_fs_info *fs_info)
                                break;
                        }
                        err = btrfs_del_orphan_item(trans, tree_root,
-                                                   root_key.objectid);
+                                                   root_objectid);
                        btrfs_end_transaction(trans);
                        if (err) {
                                btrfs_handle_fs_error(fs_info, err,