From: David Sterba <dsterba@suse.cz>
Date: Mon, 13 Jun 2011 17:54:22 +0000 (+0000)
Subject: btrfs: fix dereference of ERR_PTR value
X-Git-Tag: v3.0-rc4~9^2~4
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=3ed4498caf381a73d6259d3ffacc914b17a507ec;p=~emulex%2Finfiniband.git

btrfs: fix dereference of ERR_PTR value

smatch reports:

btrfs_recover_log_trees error: 'wc.replay_dest' dereferencing
possible ERR_PTR()

Signed-off-by: David Sterba <dsterba@suse.cz>
Signed-off-by: Chris Mason <chris.mason@oracle.com>
---

diff --git a/fs/btrfs/tree-log.c b/fs/btrfs/tree-log.c
index 592396c6dc4..4ce8a9f41d1 100644
--- a/fs/btrfs/tree-log.c
+++ b/fs/btrfs/tree-log.c
@@ -3177,7 +3177,7 @@ again:
 		tmp_key.offset = (u64)-1;
 
 		wc.replay_dest = btrfs_read_fs_root_no_name(fs_info, &tmp_key);
-		BUG_ON(!wc.replay_dest);
+		BUG_ON(IS_ERR_OR_NULL(wc.replay_dest));
 
 		wc.replay_dest->log_root = log;
 		btrfs_record_root_in_trans(trans, wc.replay_dest);