diff options
author | David Howells <dhowells@redhat.com> | 2006-08-24 15:44:16 -0400 |
---|---|---|
committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-09-22 23:24:55 -0400 |
commit | 6daabf1b04c89f1fbd8eab5450261360943c8e20 (patch) | |
tree | a4aa0653c5edaf6deb41a10c16b8476f331e7c72 /fs/nfs | |
parent | 158998b6fe36f6acef087f574c96d44713499cc9 (diff) |
NFS: Fix up compiler warnings on 64-bit platforms in client.c
Fix up warnings from compiling on ppc64.
Signed-Off-By: David Howells <dhowells@redhat.com>
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Diffstat (limited to 'fs/nfs')
-rw-r--r-- | fs/nfs/client.c | 20 |
1 files changed, 14 insertions, 6 deletions
diff --git a/fs/nfs/client.c b/fs/nfs/client.c index f1ff2aec2ca5..a4aa47913a5c 100644 --- a/fs/nfs/client.c +++ b/fs/nfs/client.c | |||
@@ -836,7 +836,9 @@ struct nfs_server *nfs_create_server(const struct nfs_mount_data *data, | |||
836 | } | 836 | } |
837 | memcpy(&server->fsid, &fattr.fsid, sizeof(server->fsid)); | 837 | memcpy(&server->fsid, &fattr.fsid, sizeof(server->fsid)); |
838 | 838 | ||
839 | dprintk("Server FSID: %llx:%llx\n", server->fsid.major, server->fsid.minor); | 839 | dprintk("Server FSID: %llx:%llx\n", |
840 | (unsigned long long) server->fsid.major, | ||
841 | (unsigned long long) server->fsid.minor); | ||
840 | 842 | ||
841 | BUG_ON(!server->nfs_client); | 843 | BUG_ON(!server->nfs_client); |
842 | BUG_ON(!server->nfs_client->rpc_ops); | 844 | BUG_ON(!server->nfs_client->rpc_ops); |
@@ -1002,7 +1004,9 @@ struct nfs_server *nfs4_create_server(const struct nfs4_mount_data *data, | |||
1002 | if (error < 0) | 1004 | if (error < 0) |
1003 | goto error; | 1005 | goto error; |
1004 | 1006 | ||
1005 | dprintk("Server FSID: %llx:%llx\n", server->fsid.major, server->fsid.minor); | 1007 | dprintk("Server FSID: %llx:%llx\n", |
1008 | (unsigned long long) server->fsid.major, | ||
1009 | (unsigned long long) server->fsid.minor); | ||
1006 | dprintk("Mount FH: %d\n", mntfh->size); | 1010 | dprintk("Mount FH: %d\n", mntfh->size); |
1007 | 1011 | ||
1008 | error = nfs_probe_fsinfo(server, mntfh, &fattr); | 1012 | error = nfs_probe_fsinfo(server, mntfh, &fattr); |
@@ -1074,7 +1078,8 @@ struct nfs_server *nfs4_create_referral_server(struct nfs_clone_mount *data, | |||
1074 | goto error; | 1078 | goto error; |
1075 | 1079 | ||
1076 | dprintk("Referral FSID: %llx:%llx\n", | 1080 | dprintk("Referral FSID: %llx:%llx\n", |
1077 | server->fsid.major, server->fsid.minor); | 1081 | (unsigned long long) server->fsid.major, |
1082 | (unsigned long long) server->fsid.minor); | ||
1078 | 1083 | ||
1079 | spin_lock(&nfs_client_lock); | 1084 | spin_lock(&nfs_client_lock); |
1080 | list_add_tail(&server->client_link, &server->nfs_client->cl_superblocks); | 1085 | 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 | int error; | 1111 | int error; |
1107 | 1112 | ||
1108 | dprintk("--> nfs_clone_server(,%llx:%llx,)\n", | 1113 | dprintk("--> nfs_clone_server(,%llx:%llx,)\n", |
1109 | fattr->fsid.major, fattr->fsid.minor); | 1114 | (unsigned long long) fattr->fsid.major, |
1115 | (unsigned long long) fattr->fsid.minor); | ||
1110 | 1116 | ||
1111 | server = nfs_alloc_server(); | 1117 | server = nfs_alloc_server(); |
1112 | if (!server) | 1118 | if (!server) |
@@ -1131,7 +1137,8 @@ struct nfs_server *nfs_clone_server(struct nfs_server *source, | |||
1131 | goto out_free_server; | 1137 | goto out_free_server; |
1132 | 1138 | ||
1133 | dprintk("Cloned FSID: %llx:%llx\n", | 1139 | dprintk("Cloned FSID: %llx:%llx\n", |
1134 | server->fsid.major, server->fsid.minor); | 1140 | (unsigned long long) server->fsid.major, |
1141 | (unsigned long long) server->fsid.minor); | ||
1135 | 1142 | ||
1136 | error = nfs_start_lockd(server); | 1143 | error = nfs_start_lockd(server); |
1137 | if (error < 0) | 1144 | if (error < 0) |
@@ -1375,7 +1382,8 @@ static int nfs_volume_list_show(struct seq_file *m, void *v) | |||
1375 | MAJOR(server->s_dev), MINOR(server->s_dev)); | 1382 | MAJOR(server->s_dev), MINOR(server->s_dev)); |
1376 | 1383 | ||
1377 | snprintf(fsid, 17, "%llx:%llx", | 1384 | snprintf(fsid, 17, "%llx:%llx", |
1378 | server->fsid.major, server->fsid.minor); | 1385 | (unsigned long long) server->fsid.major, |
1386 | (unsigned long long) server->fsid.minor); | ||
1379 | 1387 | ||
1380 | seq_printf(m, "v%d %02x%02x%02x%02x %4hx %-7s %-17s\n", | 1388 | seq_printf(m, "v%d %02x%02x%02x%02x %4hx %-7s %-17s\n", |
1381 | clp->cl_nfsversion, | 1389 | clp->cl_nfsversion, |