Commit 6daabf1b authored by David Howells's avatar David Howells Committed by Trond Myklebust

NFS: Fix up compiler warnings on 64-bit platforms in client.c

Fix up warnings from compiling on ppc64.
Signed-Off-By: default avatarDavid Howells <dhowells@redhat.com>
Signed-off-by: default avatarTrond Myklebust <Trond.Myklebust@netapp.com>
parent 158998b6
...@@ -836,7 +836,9 @@ struct nfs_server *nfs_create_server(const struct nfs_mount_data *data, ...@@ -836,7 +836,9 @@ struct nfs_server *nfs_create_server(const struct nfs_mount_data *data,
} }
memcpy(&server->fsid, &fattr.fsid, sizeof(server->fsid)); memcpy(&server->fsid, &fattr.fsid, sizeof(server->fsid));
dprintk("Server FSID: %llx:%llx\n", server->fsid.major, server->fsid.minor); dprintk("Server FSID: %llx:%llx\n",
(unsigned long long) server->fsid.major,
(unsigned long long) server->fsid.minor);
BUG_ON(!server->nfs_client); BUG_ON(!server->nfs_client);
BUG_ON(!server->nfs_client->rpc_ops); BUG_ON(!server->nfs_client->rpc_ops);
...@@ -1002,7 +1004,9 @@ struct nfs_server *nfs4_create_server(const struct nfs4_mount_data *data, ...@@ -1002,7 +1004,9 @@ struct nfs_server *nfs4_create_server(const struct nfs4_mount_data *data,
if (error < 0) if (error < 0)
goto error; goto error;
dprintk("Server FSID: %llx:%llx\n", server->fsid.major, server->fsid.minor); dprintk("Server FSID: %llx:%llx\n",
(unsigned long long) server->fsid.major,
(unsigned long long) server->fsid.minor);
dprintk("Mount FH: %d\n", mntfh->size); dprintk("Mount FH: %d\n", mntfh->size);
error = nfs_probe_fsinfo(server, mntfh, &fattr); error = nfs_probe_fsinfo(server, mntfh, &fattr);
...@@ -1074,7 +1078,8 @@ struct nfs_server *nfs4_create_referral_server(struct nfs_clone_mount *data, ...@@ -1074,7 +1078,8 @@ struct nfs_server *nfs4_create_referral_server(struct nfs_clone_mount *data,
goto error; goto error;
dprintk("Referral FSID: %llx:%llx\n", dprintk("Referral FSID: %llx:%llx\n",
server->fsid.major, server->fsid.minor); (unsigned long long) server->fsid.major,
(unsigned long long) server->fsid.minor);
spin_lock(&nfs_client_lock); spin_lock(&nfs_client_lock);
list_add_tail(&server->client_link, &server->nfs_client->cl_superblocks); list_add_tail(&server->client_link, &server->nfs_client->cl_superblocks);
...@@ -1106,7 +1111,8 @@ struct nfs_server *nfs_clone_server(struct nfs_server *source, ...@@ -1106,7 +1111,8 @@ struct nfs_server *nfs_clone_server(struct nfs_server *source,
int error; int error;
dprintk("--> nfs_clone_server(,%llx:%llx,)\n", dprintk("--> nfs_clone_server(,%llx:%llx,)\n",
fattr->fsid.major, fattr->fsid.minor); (unsigned long long) fattr->fsid.major,
(unsigned long long) fattr->fsid.minor);
server = nfs_alloc_server(); server = nfs_alloc_server();
if (!server) if (!server)
...@@ -1131,7 +1137,8 @@ struct nfs_server *nfs_clone_server(struct nfs_server *source, ...@@ -1131,7 +1137,8 @@ struct nfs_server *nfs_clone_server(struct nfs_server *source,
goto out_free_server; goto out_free_server;
dprintk("Cloned FSID: %llx:%llx\n", dprintk("Cloned FSID: %llx:%llx\n",
server->fsid.major, server->fsid.minor); (unsigned long long) server->fsid.major,
(unsigned long long) server->fsid.minor);
error = nfs_start_lockd(server); error = nfs_start_lockd(server);
if (error < 0) if (error < 0)
...@@ -1375,7 +1382,8 @@ static int nfs_volume_list_show(struct seq_file *m, void *v) ...@@ -1375,7 +1382,8 @@ static int nfs_volume_list_show(struct seq_file *m, void *v)
MAJOR(server->s_dev), MINOR(server->s_dev)); MAJOR(server->s_dev), MINOR(server->s_dev));
snprintf(fsid, 17, "%llx:%llx", snprintf(fsid, 17, "%llx:%llx",
server->fsid.major, server->fsid.minor); (unsigned long long) server->fsid.major,
(unsigned long long) server->fsid.minor);
seq_printf(m, "v%d %02x%02x%02x%02x %4hx %-7s %-17s\n", seq_printf(m, "v%d %02x%02x%02x%02x %4hx %-7s %-17s\n",
clp->cl_nfsversion, clp->cl_nfsversion,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment