On Thu, Sep 10, 2009 at 12:25:04PM +0300, Benny Halevy wrote:
> Move struct rpc_buffer's definition into a sunrpc.h, a common, internal
> header file, in preparation for supporting the nfsv4.1 backchannel.
Applied, thanks.
--b.
>
> Signed-off-by: Benny Halevy <bhalevy@xxxxxxxxxxx>
> [nfs41: sunrpc: #include <linux/net.h> from sunrpc.h]
> Signed-off-by: Benny Halevy <bhalevy@xxxxxxxxxxx>
> ---
> net/sunrpc/sched.c | 7 ++-----
> net/sunrpc/sunrpc.h | 10 ++++++++++
> 2 files changed, 12 insertions(+), 5 deletions(-)
>
> diff --git a/net/sunrpc/sched.c b/net/sunrpc/sched.c
> index 8f459ab..cef74ba 100644
> --- a/net/sunrpc/sched.c
> +++ b/net/sunrpc/sched.c
> @@ -21,6 +21,8 @@
>
> #include <linux/sunrpc/clnt.h>
>
> +#include "sunrpc.h"
> +
> #ifdef RPC_DEBUG
> #define RPCDBG_FACILITY RPCDBG_SCHED
> #define RPC_TASK_MAGIC_ID 0xf00baa
> @@ -711,11 +713,6 @@ static void rpc_async_schedule(struct work_struct *work)
> __rpc_execute(container_of(work, struct rpc_task, u.tk_work));
> }
>
> -struct rpc_buffer {
> - size_t len;
> - char data[];
> -};
> -
> /**
> * rpc_malloc - allocate an RPC buffer
> * @task: RPC task that will use this buffer
> diff --git a/net/sunrpc/sunrpc.h b/net/sunrpc/sunrpc.h
> index 5d9dd74..13171e6 100644
> --- a/net/sunrpc/sunrpc.h
> +++ b/net/sunrpc/sunrpc.h
> @@ -27,6 +27,16 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
> #ifndef _NET_SUNRPC_SUNRPC_H
> #define _NET_SUNRPC_SUNRPC_H
>
> +#include <linux/net.h>
> +
> +/*
> + * Header for dynamically allocated rpc buffers.
> + */
> +struct rpc_buffer {
> + size_t len;
> + char data[];
> +};
> +
> static inline int rpc_reply_expected(struct rpc_task *task)
> {
> return (task->tk_msg.rpc_proc != NULL) &&
> --
> 1.6.4
>
--
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
