diff options
| author | Mark Fasheh <mfasheh@suse.com> | 2011-07-12 11:25:31 -0700 |
|---|---|---|
| committer | Mark Fasheh <mfasheh@suse.com> | 2011-07-14 14:14:45 -0700 |
| commit | 1748f843a0190ef4332d03a64263f383af72682b (patch) | |
| tree | cf577aabbd13a639e2fdf4e6edb017f2276aa9c4 /fs | |
| parent | 0eb0e19cde6f01397ef8c0e094e44beb75c62a1e (diff) | |
| download | linux-1748f843a0190ef4332d03a64263f383af72682b.tar.gz linux-1748f843a0190ef4332d03a64263f383af72682b.tar.bz2 linux-1748f843a0190ef4332d03a64263f383af72682b.zip | |
btrfs: Don't BUG_ON alloc_path errors in btrfs_read_locked_inode
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>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/btrfs/inode.c | 22 |
1 files changed, 17 insertions, 5 deletions
diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c index a0faf7d7f0e0..88829993db6c 100644 --- a/fs/btrfs/inode.c +++ b/fs/btrfs/inode.c @@ -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)); @@ -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) @@ -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; |