From 8383e894229c09861c90ec3cac7c8ce0e5f9fb27 Mon Sep 17 00:00:00 2001
From: Jonathan Brassow <jbrassow@redhat.com>
Date: Thu, 13 Jan 2011 19:59:49 +0000
Subject: [PATCH] --- yaml --- r: 230667 b: refs/heads/master c:
 4a038677df4da84e42fd68b5ab2dfa4d82baa444 h: refs/heads/master i:   230665:
 b87a36817da05ff458058d374d9bcfd55c26d01f   230663:
 9e1fa366d65b98ad017c1738c042484c5b351ecd v: v3

---
 [refs]                                   |  2 +-
 trunk/drivers/md/dm-log-userspace-base.c | 10 ++++++----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 77c80fd4b012..89bcbbc0ad23 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 69a8cfcda21017364df1c21b720daf304b5598a6
+refs/heads/master: 4a038677df4da84e42fd68b5ab2dfa4d82baa444
diff --git a/trunk/drivers/md/dm-log-userspace-base.c b/trunk/drivers/md/dm-log-userspace-base.c
index 1ed0094f064b..1c25ad3d02a2 100644
--- a/trunk/drivers/md/dm-log-userspace-base.c
+++ b/trunk/drivers/md/dm-log-userspace-base.c
@@ -181,8 +181,11 @@ static int userspace_ctr(struct dm_dirty_log *log, struct dm_target *ti,
 	r = dm_consult_userspace(lc->uuid, lc->luid, DM_ULOG_CTR,
 				 ctr_str, str_size, NULL, NULL);
 
-	if (r == -ESRCH) {
-		DMERR("Userspace log server not found");
+	if (r < 0) {
+		if (r == -ESRCH)
+			DMERR("Userspace log server not found");
+		else
+			DMERR("Userspace log server failed to create log");
 		goto out;
 	}
 
@@ -214,10 +217,9 @@ static int userspace_ctr(struct dm_dirty_log *log, struct dm_target *ti,
 
 static void userspace_dtr(struct dm_dirty_log *log)
 {
-	int r;
 	struct log_c *lc = log->context;
 
-	r = dm_consult_userspace(lc->uuid, lc->luid, DM_ULOG_DTR,
+	(void) dm_consult_userspace(lc->uuid, lc->luid, DM_ULOG_DTR,
 				 NULL, 0,
 				 NULL, NULL);