From 7b27dea4ed9f3f202eb3fc90871da11594e94be0 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sun, 11 Sep 2011 10:52:24 -0400 Subject: [PATCH] --- yaml --- r: 263731 b: refs/heads/master c: e0b6d65be57fb37ca67b04ce8964546a74d2125c h: refs/heads/master i: 263729: 57d48b31da5005934dbb08979f2507bf7a981d0f 263727: 691f2398561df904f4f783f8a2ec5d7b9a80be16 v: v3 --- [refs] | 2 +- trunk/fs/btrfs/inode.c | 10 +++------- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/[refs] b/[refs] index 8c37635286ac..8166bb520cc9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 14c7cca780bd210564ae964f57a8bb807d0b3dbf +refs/heads/master: e0b6d65be57fb37ca67b04ce8964546a74d2125c diff --git a/trunk/fs/btrfs/inode.c b/trunk/fs/btrfs/inode.c index 34195f9fc6bb..edd45f709989 100644 --- a/trunk/fs/btrfs/inode.c +++ b/trunk/fs/btrfs/inode.c @@ -3952,7 +3952,6 @@ 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) @@ -3968,15 +3967,12 @@ struct inode *btrfs_iget(struct super_block *s, struct btrfs_key *location, if (new) *new = 1; } else { - bad_inode = 1; + unlock_new_inode(inode); + iput(inode); + inode = ERR_PTR(-ESTALE); } } - if (bad_inode) { - iput(inode); - inode = ERR_PTR(-ESTALE); - } - return inode; }