The following commit has been merged in the linux branch: commit a1be9eee2996fd9969625e7b5e2f2bc2032fd3cb Author: Stefan Richter stefanr@s5r6.in-berlin.de Date: Mon Oct 12 11:26:12 2009 -0400
NFS: suppress a build warning
struct sockaddr_storage * can safely be used as struct sockaddr *. Suppress an "incompatible pointer type" warning.
Signed-off-by: Stefan Richter stefanr@s5r6.in-berlin.de Signed-off-by: Trond Myklebust Trond.Myklebust@netapp.com Signed-off-by: Linus Torvalds torvalds@linux-foundation.org
diff --git a/fs/nfs/super.c b/fs/nfs/super.c index 6dabf6f..a2c18ac 100644 --- a/fs/nfs/super.c +++ b/fs/nfs/super.c @@ -1848,8 +1848,8 @@ nfs_compare_remount_data(struct nfs_server *nfss, data->timeo != (10U * nfss->client->cl_timeout->to_initval / HZ) || data->nfs_server.port != nfss->port || data->nfs_server.addrlen != nfss->nfs_client->cl_addrlen || - !rpc_cmp_addr(&data->nfs_server.address, - &nfss->nfs_client->cl_addr)) + !rpc_cmp_addr((struct sockaddr *)&data->nfs_server.address, + (struct sockaddr *)&nfss->nfs_client->cl_addr)) return -EINVAL;
return 0;