Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 230667
b: refs/heads/master
c: 4a03867
h: refs/heads/master
i:
  230665: b87a368
  230663: 9e1fa36
v: v3
  • Loading branch information
Jonathan Brassow authored and Alasdair G Kergon committed Jan 13, 2011
1 parent bcb021d commit 8383e89
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 5 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 69a8cfcda21017364df1c21b720daf304b5598a6
refs/heads/master: 4a038677df4da84e42fd68b5ab2dfa4d82baa444
10 changes: 6 additions & 4 deletions trunk/drivers/md/dm-log-userspace-base.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand Down Expand Up @@ -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);

Expand Down

0 comments on commit 8383e89

Please sign in to comment.