diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2012-05-10 04:51:07 +0200 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2012-05-10 04:51:07 +0200 |
| commit | 15f99cbd071aa402e113d342448603344a337046 (patch) | |
| tree | 56f98892d1bd38029988eb8931e2321ef7e79aa0 /fs/nfsd/nfs4recover.c | |
| parent | sh64: Kill off unused trap_no/error_code from thread_struct. (diff) | |
| parent | sh: Add pinmux for sh7264 (diff) | |
| download | linux-15f99cbd071aa402e113d342448603344a337046.tar.xz linux-15f99cbd071aa402e113d342448603344a337046.zip | |
Merge branch 'sh/rsk-updates' into sh-latest
Conflicts:
arch/sh/Kconfig
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'fs/nfsd/nfs4recover.c')
| -rw-r--r-- | fs/nfsd/nfs4recover.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/nfsd/nfs4recover.c b/fs/nfsd/nfs4recover.c index 4767429264a2..ed3f9206a0ee 100644 --- a/fs/nfsd/nfs4recover.c +++ b/fs/nfsd/nfs4recover.c @@ -577,7 +577,7 @@ cld_pipe_downcall(struct file *filp, const char __user *src, size_t mlen) struct cld_net *cn = nn->cld_net; if (mlen != sizeof(*cmsg)) { - dprintk("%s: got %lu bytes, expected %lu\n", __func__, mlen, + dprintk("%s: got %zu bytes, expected %zu\n", __func__, mlen, sizeof(*cmsg)); return -EINVAL; } |