Skip to content

Commit

Permalink
btrfs: Don't BUG_ON alloc_path errors in btrfs_read_locked_inode
Browse files Browse the repository at this point in the history
btrfs_iget() also needed an update so that errors from btrfs_locked_inode()
are caught and bubbled back up.

Signed-off-by: Mark Fasheh <mfasheh@suse.com>
  • Loading branch information
Mark Fasheh committed Jul 14, 2011
1 parent 0eb0e19 commit 1748f84
Showing 1 changed file with 17 additions and 5 deletions.
22 changes: 17 additions & 5 deletions fs/btrfs/inode.c
Original file line number Diff line number Diff line change
Expand Up @@ -2518,7 +2518,9 @@ static void btrfs_read_locked_inode(struct inode *inode)
filled = true;

path = btrfs_alloc_path();
BUG_ON(!path);
if (!path)
goto make_bad;

path->leave_spinning = 1;
memcpy(&location, &BTRFS_I(inode)->location, sizeof(location));

Expand Down Expand Up @@ -3973,6 +3975,7 @@ struct inode *btrfs_iget(struct super_block *s, struct btrfs_key *location,
struct btrfs_root *root, int *new)
{
struct inode *inode;
int bad_inode = 0;

inode = btrfs_iget_locked(s, location->objectid, root);
if (!inode)
Expand All @@ -3982,10 +3985,19 @@ struct inode *btrfs_iget(struct super_block *s, struct btrfs_key *location,
BTRFS_I(inode)->root = root;
memcpy(&BTRFS_I(inode)->location, location, sizeof(*location));
btrfs_read_locked_inode(inode);
inode_tree_add(inode);
unlock_new_inode(inode);
if (new)
*new = 1;
if (!is_bad_inode(inode)) {
inode_tree_add(inode);
unlock_new_inode(inode);
if (new)
*new = 1;
} else {
bad_inode = 1;
}
}

if (bad_inode) {
iput(inode);
inode = ERR_PTR(-ESTALE);
}

return inode;
Expand Down

0 comments on commit 1748f84

Please sign in to comment.