From ad22635b8a8cb1bcf3d47a9a351f86ebcd69d4a1 Mon Sep 17 00:00:00 2001
From: Julia Lawall <julia@diku.dk>
Date: Mon, 27 Jul 2009 18:15:25 +0200
Subject: [PATCH] --- yaml --- r: 162747 b: refs/heads/master c:
 a0f7bfd3429fc48f4d1aa5364b9428d75798ba04 h: refs/heads/master i:   162745:
 170f5bdbf6eb5a3a93ddd565d6c9d10980326e64   162743:
 a05991fa31377b79c38bcbbd536e251333bd6e85 v: v3

---
 [refs]                       | 2 +-
 trunk/fs/xfs/xfs_trans_buf.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index f168d4888116..72c1f757c714 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: eb00457d624c70a2492c319e7e05ed7e067b2794
+refs/heads/master: a0f7bfd3429fc48f4d1aa5364b9428d75798ba04
diff --git a/trunk/fs/xfs/xfs_trans_buf.c b/trunk/fs/xfs/xfs_trans_buf.c
index 8ee2f8c8b0a6..218829e6a152 100644
--- a/trunk/fs/xfs/xfs_trans_buf.c
+++ b/trunk/fs/xfs/xfs_trans_buf.c
@@ -307,7 +307,7 @@ xfs_trans_read_buf(
 			return (flags & XFS_BUF_TRYLOCK) ?
 					EAGAIN : XFS_ERROR(ENOMEM);
 
-		if ((bp != NULL) && (XFS_BUF_GETERROR(bp) != 0)) {
+		if (XFS_BUF_GETERROR(bp) != 0) {
 			xfs_ioerror_alert("xfs_trans_read_buf", mp,
 					  bp, blkno);
 			error = XFS_BUF_GETERROR(bp);
@@ -315,7 +315,7 @@ xfs_trans_read_buf(
 			return error;
 		}
 #ifdef DEBUG
-		if (xfs_do_error && (bp != NULL)) {
+		if (xfs_do_error) {
 			if (xfs_error_target == target) {
 				if (((xfs_req_num++) % xfs_error_mod) == 0) {
 					xfs_buf_relse(bp);