summaryrefslogtreecommitdiffstats
path: root/fs/btrfs
diff options
context:
space:
mode:
authorChris Mason <chris.mason@oracle.com>2011-05-22 13:11:22 +0200
committerChris Mason <chris.mason@oracle.com>2011-05-22 13:11:22 +0200
commit0d0ca30f180906224be6279788f2b202cfd959d8 (patch)
treea0e35c968410f3f08f2a215ed5b4d6449d8bd11f /fs/btrfs
parentMerge branch 'delayed_inode' into inode_numbers (diff)
downloadlinux-0d0ca30f180906224be6279788f2b202cfd959d8.tar.xz
linux-0d0ca30f180906224be6279788f2b202cfd959d8.zip
Btrfs: update the delayed inode code to use the btrfs_ino helper.
Signed-off-by: Chris Mason <chris.mason@oracle.com>
Diffstat (limited to 'fs/btrfs')
-rw-r--r--fs/btrfs/delayed-inode.c11
-rw-r--r--fs/btrfs/dir-item.c2
2 files changed, 7 insertions, 6 deletions
diff --git a/fs/btrfs/delayed-inode.c b/fs/btrfs/delayed-inode.c
index 95485318f001..c25405f69360 100644
--- a/fs/btrfs/delayed-inode.c
+++ b/fs/btrfs/delayed-inode.c
@@ -88,6 +88,7 @@ static struct btrfs_delayed_node *btrfs_get_or_create_delayed_node(
struct btrfs_delayed_node *node;
struct btrfs_inode *btrfs_inode = BTRFS_I(inode);
struct btrfs_root *root = btrfs_inode->root;
+ u64 ino = btrfs_ino(inode);
int ret;
again:
@@ -98,7 +99,7 @@ again:
}
spin_lock(&root->inode_lock);
- node = radix_tree_lookup(&root->delayed_nodes_tree, inode->i_ino);
+ node = radix_tree_lookup(&root->delayed_nodes_tree, ino);
if (node) {
if (btrfs_inode->delayed_node) {
spin_unlock(&root->inode_lock);
@@ -115,7 +116,7 @@ again:
node = kmem_cache_alloc(delayed_node_cache, GFP_NOFS);
if (!node)
return ERR_PTR(-ENOMEM);
- btrfs_init_delayed_node(node, root, inode->i_ino);
+ btrfs_init_delayed_node(node, root, ino);
atomic_inc(&node->refs); /* cached in the btrfs inode */
atomic_inc(&node->refs); /* can be accessed */
@@ -127,7 +128,7 @@ again:
}
spin_lock(&root->inode_lock);
- ret = radix_tree_insert(&root->delayed_nodes_tree, inode->i_ino, node);
+ ret = radix_tree_insert(&root->delayed_nodes_tree, ino, node);
if (ret == -EEXIST) {
kmem_cache_free(delayed_node_cache, node);
spin_unlock(&root->inode_lock);
@@ -1274,7 +1275,7 @@ int btrfs_insert_delayed_dir_index(struct btrfs_trans_handle *trans,
*/
BUG_ON(ret);
- delayed_item->key.objectid = dir->i_ino;
+ delayed_item->key.objectid = btrfs_ino(dir);
btrfs_set_key_type(&delayed_item->key, BTRFS_DIR_INDEX_KEY);
delayed_item->key.offset = index;
@@ -1337,7 +1338,7 @@ int btrfs_delete_delayed_dir_index(struct btrfs_trans_handle *trans,
if (IS_ERR(node))
return PTR_ERR(node);
- item_key.objectid = dir->i_ino;
+ item_key.objectid = btrfs_ino(dir);
btrfs_set_key_type(&item_key, BTRFS_DIR_INDEX_KEY);
item_key.offset = index;
diff --git a/fs/btrfs/dir-item.c b/fs/btrfs/dir-item.c
index f53fb3847c96..e757202a014e 100644
--- a/fs/btrfs/dir-item.c
+++ b/fs/btrfs/dir-item.c
@@ -138,7 +138,7 @@ int btrfs_insert_dir_item(struct btrfs_trans_handle *trans, struct btrfs_root
struct btrfs_disk_key disk_key;
u32 data_size;
- key.objectid = dir->i_ino;
+ key.objectid = btrfs_ino(dir);
btrfs_set_key_type(&key, BTRFS_DIR_ITEM_KEY);
key.offset = btrfs_name_hash(name, name_len);