diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-23 10:14:45 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-23 10:14:45 -0700 |
commit | b4d0b08a4c3947c6ac004c9d83154ec5999c1861 (patch) | |
tree | c0f3ece1274d868c6288cc2843918c31b4885f43 /fs | |
parent | 33217379becdee25021cabb25032b3bf703d0e96 (diff) | |
parent | e45c5405e12c7cef93940cb7a541ab459ec0096a (diff) | |
download | linux-3.10-b4d0b08a4c3947c6ac004c9d83154ec5999c1861.tar.gz linux-3.10-b4d0b08a4c3947c6ac004c9d83154ec5999c1861.tar.bz2 linux-3.10-b4d0b08a4c3947c6ac004c9d83154ec5999c1861.zip |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs:
9p: fix sparse warnings
9p: rdma: RDMA Transport Support for 9P
9p: fix format warning
9p: fix debug build error
Diffstat (limited to 'fs')
-rw-r--r-- | fs/9p/vfs_file.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/9p/vfs_file.c b/fs/9p/vfs_file.c index 041c5269228..68bf2af6c38 100644 --- a/fs/9p/vfs_file.c +++ b/fs/9p/vfs_file.c @@ -178,7 +178,7 @@ v9fs_file_read(struct file *filp, char __user *udata, size_t count, int ret; struct p9_fid *fid; - P9_DPRINTK(P9_DEBUG_VFS, "count %d offset %lld\n", count, *offset); + P9_DPRINTK(P9_DEBUG_VFS, "count %zu offset %lld\n", count, *offset); fid = filp->private_data; if (count > (fid->clnt->msize - P9_IOHDRSZ)) |