git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs...
[pandora-kernel.git]
/
fs
/
btrfs
/
inode.c
diff --git
a/fs/btrfs/inode.c
b/fs/btrfs/inode.c
index
5132c9a
..
558cac2
100644
(file)
--- a/
fs/btrfs/inode.c
+++ b/
fs/btrfs/inode.c
@@
-3877,7
+3877,7
@@
again:
p = &root->inode_tree.rb_node;
parent = NULL;
p = &root->inode_tree.rb_node;
parent = NULL;
- if (
hlist_unhashed(&inode->i_hash
))
+ if (
inode_unhashed(inode
))
return;
spin_lock(&root->inode_lock);
return;
spin_lock(&root->inode_lock);
@@
-4803,7
+4803,7
@@
static int btrfs_link(struct dentry *old_dentry, struct inode *dir,
}
btrfs_set_trans_block_group(trans, dir);
}
btrfs_set_trans_block_group(trans, dir);
-
atomic_inc(&inode->i_count
);
+
ihold(inode
);
err = btrfs_add_nondir(trans, dentry, inode, 1, index);
err = btrfs_add_nondir(trans, dentry, inode, 1, index);