Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[~andy/linux] / fs / nfs / read.c

diff --git a/fs/nfs/read.c b/fs/nfs/read.c
index 31db5c366b816e4c18d806ae0ae80d0c9207905e..411aedda14bb70c413fc771eb2a44e60817ed8ff 100644 (file)
--- a/fs/nfs/read.c
+++ b/fs/nfs/read.c
@@ -163,9 +163,9 @@ static void nfs_readpage_release(struct nfs_page *req)
 
        unlock_page(req->wb_page);
 
-       dprintk("NFS: read done (%s/%Ld %d@%Ld)\n",
+       dprintk("NFS: read done (%s/%Lu %d@%Ld)\n",
                        req->wb_context->dentry->d_inode->i_sb->s_id,
-                       (long long)NFS_FILEID(req->wb_context->dentry->d_inode),
+                       (unsigned long long)NFS_FILEID(req->wb_context->dentry->d_inode),
                        req->wb_bytes,
                        (long long)req_offset(req));
        nfs_release_request(req);
@@ -228,11 +228,11 @@ int nfs_initiate_read(struct rpc_clnt *clnt,
        /* Set up the initial task struct. */
        NFS_PROTO(inode)->read_setup(data, &msg);
 
-       dprintk("NFS: %5u initiated read call (req %s/%lld, %u bytes @ "
+       dprintk("NFS: %5u initiated read call (req %s/%llu, %u bytes @ "
                        "offset %llu)\n",
                        data->task.tk_pid,
                        inode->i_sb->s_id,
-                       (long long)NFS_FILEID(inode),
+                       (unsigned long long)NFS_FILEID(inode),
                        data->args.count,
                        (unsigned long long)data->args.offset);
 
@@ -630,9 +630,9 @@ int nfs_readpages(struct file *filp, struct address_space *mapping,
        unsigned long npages;
        int ret = -ESTALE;
 
-       dprintk("NFS: nfs_readpages (%s/%Ld %d)\n",
+       dprintk("NFS: nfs_readpages (%s/%Lu %d)\n",
                        inode->i_sb->s_id,
-                       (long long)NFS_FILEID(inode),
+                       (unsigned long long)NFS_FILEID(inode),
                        nr_pages);
        nfs_inc_stats(inode, NFSIOS_VFSREADPAGES);