diff options
| author | David S. Miller <davem@davemloft.net> | 2010-04-07 02:53:30 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-04-07 02:53:30 -0400 |
| commit | 4a35ecf8bf1c4b039503fa554100fe85c761de76 (patch) | |
| tree | 9b75f5d5636004d9a9aa496924377379be09aa1f /fs/btrfs/tree-log.c | |
| parent | b4d562e3c3553ac58c7120555c4e4aefbb090a2a (diff) | |
| parent | fb9e2d887243499b8d28efcf80821c4f6a092395 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/bonding/bond_main.c
drivers/net/via-velocity.c
drivers/net/wireless/iwlwifi/iwl-agn.c
Diffstat (limited to 'fs/btrfs/tree-log.c')
| -rw-r--r-- | fs/btrfs/tree-log.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/btrfs/tree-log.c b/fs/btrfs/tree-log.c index 4a9434b622ec..1255fcc8ade5 100644 --- a/fs/btrfs/tree-log.c +++ b/fs/btrfs/tree-log.c | |||
| @@ -445,7 +445,7 @@ static noinline struct inode *read_one_inode(struct btrfs_root *root, | |||
| 445 | key.objectid = objectid; | 445 | key.objectid = objectid; |
| 446 | key.type = BTRFS_INODE_ITEM_KEY; | 446 | key.type = BTRFS_INODE_ITEM_KEY; |
| 447 | key.offset = 0; | 447 | key.offset = 0; |
| 448 | inode = btrfs_iget(root->fs_info->sb, &key, root); | 448 | inode = btrfs_iget(root->fs_info->sb, &key, root, NULL); |
| 449 | if (IS_ERR(inode)) { | 449 | if (IS_ERR(inode)) { |
| 450 | inode = NULL; | 450 | inode = NULL; |
| 451 | } else if (is_bad_inode(inode)) { | 451 | } else if (is_bad_inode(inode)) { |