diff options
| author | Rafael J. Wysocki <rjw@sisk.pl> | 2009-08-17 20:42:36 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rjw@sisk.pl> | 2009-08-17 20:42:36 +0200 |
| commit | e6f25a7b2398581a5f96bf9021d0b22c9647acf4 (patch) | |
| tree | 32bd69cb2abe9224da7733e14d8ea42eaccca02e | |
| parent | 3e2bcad89814030ad6a369a97ad1481fd35938d3 (diff) | |
| parent | 894ef820b10d77e2d6d717342fc408bdd9825139 (diff) | |
| download | linux-e6f25a7b2398581a5f96bf9021d0b22c9647acf4.tar.gz linux-e6f25a7b2398581a5f96bf9021d0b22c9647acf4.tar.bz2 linux-e6f25a7b2398581a5f96bf9021d0b22c9647acf4.zip | |
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) *(pkg->data_size) = 0; } else if (tfr->data_size > *(pkg->data_size)) { DMERR("Insufficient space to receive package [%u] " - "(%u vs %lu)", tfr->request_type, + "(%u vs %zu)", tfr->request_type, tfr->data_size, *(pkg->data_size)); *(pkg->data_size) = 0; |