diff options
| author | Rafael J. Wysocki <rjw@sisk.pl> | 2009-08-17 14:42:36 -0400 |
|---|---|---|
| committer | Rafael J. Wysocki <rjw@sisk.pl> | 2009-08-17 14:42:36 -0400 |
| commit | e6f25a7b2398581a5f96bf9021d0b22c9647acf4 (patch) | |
| tree | 32bd69cb2abe9224da7733e14d8ea42eaccca02e | |
| parent | 3e2bcad89814030ad6a369a97ad1481fd35938d3 (diff) | |
| parent | 894ef820b10d77e2d6d717342fc408bdd9825139 (diff) | |
Merge branch 'master' into for-linus
| -rw-r--r-- | drivers/md/dm-log-userspace-transfer.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/md/dm-log-userspace-transfer.c b/drivers/md/dm-log-userspace-transfer.c index 0ca1ee768a1f..8ce74d95ae4d 100644 --- a/drivers/md/dm-log-userspace-transfer.c +++ b/drivers/md/dm-log-userspace-transfer.c | |||
| @@ -108,7 +108,7 @@ static int fill_pkg(struct cn_msg *msg, struct dm_ulog_request *tfr) | |||
| 108 | *(pkg->data_size) = 0; | 108 | *(pkg->data_size) = 0; |
| 109 | } else if (tfr->data_size > *(pkg->data_size)) { | 109 | } else if (tfr->data_size > *(pkg->data_size)) { |
| 110 | DMERR("Insufficient space to receive package [%u] " | 110 | DMERR("Insufficient space to receive package [%u] " |
| 111 | "(%u vs %lu)", tfr->request_type, | 111 | "(%u vs %zu)", tfr->request_type, |
| 112 | tfr->data_size, *(pkg->data_size)); | 112 | tfr->data_size, *(pkg->data_size)); |
| 113 | 113 | ||
| 114 | *(pkg->data_size) = 0; | 114 | *(pkg->data_size) = 0; |