Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 93191
b: refs/heads/master
c: b7fd54a
h: refs/heads/master
i:
  93189: 2d84d00
  93187: cd792eb
  93183: d5d762b
v: v3
  • Loading branch information
Heinz Mauelshagen authored and Alasdair G Kergon committed Apr 25, 2008
1 parent 81030bc commit 71e8cff
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 8 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: c12bfc923ee02de5611730ddec087c11b3947038
refs/heads/master: b7fd54a70f99061721e604d72d940541e5b2b168
15 changes: 8 additions & 7 deletions trunk/drivers/md/dm-log.c
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
/*
* Copyright (C) 2003 Sistina Software
* Copyright (C) 2004-2008 Red Hat, Inc. All rights reserved.
*
* This file is released under the LGPL.
*/
Expand All @@ -12,7 +13,7 @@
#include "dm-log.h"
#include "dm-io.h"

#define DM_MSG_PREFIX "mirror log"
#define DM_MSG_PREFIX "dirty region log"

static LIST_HEAD(_log_types);
static DEFINE_SPINLOCK(_lock);
Expand Down Expand Up @@ -315,7 +316,7 @@ static int create_log_context(struct dirty_log *log, struct dm_target *ti,
int r;

if (argc < 1 || argc > 2) {
DMWARN("wrong number of arguments to mirror log");
DMWARN("wrong number of arguments to dirty region log");
return -EINVAL;
}

Expand All @@ -325,8 +326,8 @@ static int create_log_context(struct dirty_log *log, struct dm_target *ti,
else if (!strcmp(argv[1], "nosync"))
sync = NOSYNC;
else {
DMWARN("unrecognised sync argument to mirror log: %s",
argv[1]);
DMWARN("unrecognised sync argument to "
"dirty region log: %s", argv[1]);
return -EINVAL;
}
}
Expand Down Expand Up @@ -467,7 +468,7 @@ static int disk_ctr(struct dirty_log *log, struct dm_target *ti,
struct dm_dev *dev;

if (argc < 2 || argc > 3) {
DMWARN("wrong number of arguments to disk mirror log");
DMWARN("wrong number of arguments to disk dirty region log");
return -EINVAL;
}

Expand Down Expand Up @@ -524,7 +525,7 @@ static int disk_resume(struct dirty_log *log)
/* read the disk header */
r = read_header(lc);
if (r) {
DMWARN("%s: Failed to read header on mirror log device",
DMWARN("%s: Failed to read header on dirty region log device",
lc->log_dev->name);
fail_log_device(lc);
/*
Expand Down Expand Up @@ -562,7 +563,7 @@ static int disk_resume(struct dirty_log *log)
/* write the new header */
r = write_header(lc);
if (r) {
DMWARN("%s: Failed to write header on mirror log device",
DMWARN("%s: Failed to write header on dirty region log device",
lc->log_dev->name);
fail_log_device(lc);
}
Expand Down

0 comments on commit 71e8cff

Please sign in to comment.