On Thu, Sep 10, 2009 at 05:33:30PM +0300, Benny Halevy wrote:
> diff --git a/include/linux/sunrpc/xprtrdma.h b/include/linux/sunrpc/xprtrdma.h
> index 54a379c..c2f04e1 100644
> --- a/include/linux/sunrpc/xprtrdma.h
> +++ b/include/linux/sunrpc/xprtrdma.h
> @@ -41,11 +41,6 @@
> #define _LINUX_SUNRPC_XPRTRDMA_H
>
> /*
> - * RPC transport identifier for RDMA
> - */
> -#define XPRT_TRANSPORT_RDMA 256
> -
> -/*
> * rpcbind (v3+) RDMA netid.
> */
> #define RPCBIND_NETID_RDMA "rdma"
> diff --git a/include/linux/sunrpc/xprtsock.h b/include/linux/sunrpc/xprtsock.h
> index c2a46c4..d7c98d1 100644
> --- a/include/linux/sunrpc/xprtsock.h
> +++ b/include/linux/sunrpc/xprtsock.h
> @@ -20,8 +20,13 @@ void cleanup_socket_xprt(void);
> * values. No such restriction exists for new transports, except that
> * they may not collide with these values (17 and 6, respectively).
> */
> -#define XPRT_TRANSPORT_UDP IPPROTO_UDP
> -#define XPRT_TRANSPORT_TCP IPPROTO_TCP
> +#define XPRT_TRANSPORT_BC (1 << 31)
> +enum xprt_transports {
> + XPRT_TRANSPORT_UDP = IPPROTO_UDP,
> + XPRT_TRANSPORT_TCP = IPPROTO_TCP,
> + XPRT_TRANSPORT_BC_TCP = IPPROTO_TCP | XPRT_TRANSPORT_BC,
> + XPRT_TRANSPORT_RDMA = 256
> +};
This fails to compile when CONFIG_SUNRPC_XPRT_RDMA is set.
A minimal fix might be:
--- a/net/sunrpc/xprtrdma/transport.c
+++ b/net/sunrpc/xprtrdma/transport.c
@@ -50,6 +50,8 @@
#include <linux/module.h>
#include <linux/init.h>
#include <linux/seq_file.h>
+#include <linux/in.h>
+#include <linux/sunrpc/xprtsock.h>
#include "xprt_rdma.h"
Or maybe just ditch the enum and leave these as they were before.
--b.
--
To unsubscribe from this list: send the line "unsubscribe linux-nfs" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
