[PATCH 3/3] SQUASHME: nfs41: get rid of READ64 in callback_xdr.c

[PATCH 3/3] SQUASHME: nfs41: get rid of READ64 in callback_xdr.c

[Benny Halevy]

This was only used later on by the pnfs code.

Fixes Trond's review comment from 2009-06-15:
Re: [pnfs] [RFC 31/39] nfs41: cb_sequence xdr implementation
http://linux-nfs.org/pipermail/pnfs/2009-June/007846.html

Signed-off-by: Benny Halevy <bhalevy@panasas.com>
---
 fs/nfs/callback_xdr.c |    5 -----
 1 files changed, 0 insertions(+), 5 deletions(-)

diff --git a/fs/nfs/callback_xdr.c b/fs/nfs/callback_xdr.c
index 28242a0..e5a2dac 100644
--- a/fs/nfs/callback_xdr.c
+++ b/fs/nfs/callback_xdr.c
@@ -27,11 +27,6 @@
 
 #define NFSDBG_FACILITY NFSDBG_CALLBACK
 
-#define READ64(x)         do {			\
-	(x) = (u64)ntohl(*p++) << 32;		\
-	(x) |= ntohl(*p++);			\
-} while (0)
-
 typedef __be32 (*callback_process_op_t)(void *, void *);
 typedef __be32 (*callback_decode_arg_t)(struct svc_rqst *, struct xdr_stream *, void *);
 typedef __be32 (*callback_encode_res_t)(struct svc_rqst *, struct xdr_stream *, void *);
-- 
1.6.3.1

Re: [PATCH 3/3] SQUASHME: nfs41: get rid of READ64 in callback_xdr.c

[Trond Myklebust]

On Wed, 2009-06-17 at 20:22 +0300, Benny Halevy wrote:
> This was only used later on by the pnfs code.
> 
> Fixes Trond's review comment from 2009-06-15:
> Re: [pnfs] [RFC 31/39] nfs41: cb_sequence xdr implementation
> http://linux-nfs.org/pipermail/pnfs/2009-June/007846.html
> 
> Signed-off-by: Benny Halevy <bhalevy@panasas.com>
> ---
>  fs/nfs/callback_xdr.c |    5 -----
>  1 files changed, 0 insertions(+), 5 deletions(-)
> 
> diff --git a/fs/nfs/callback_xdr.c b/fs/nfs/callback_xdr.c
> index 28242a0..e5a2dac 100644
> --- a/fs/nfs/callback_xdr.c
> +++ b/fs/nfs/callback_xdr.c
> @@ -27,11 +27,6 @@
>  
>  #define NFSDBG_FACILITY NFSDBG_CALLBACK
>  
> -#define READ64(x)         do {			\
> -	(x) = (u64)ntohl(*p++) << 32;		\
> -	(x) |= ntohl(*p++);			\
> -} while (0)
> -
>  typedef __be32 (*callback_process_op_t)(void *, void *);
>  typedef __be32 (*callback_decode_arg_t)(struct svc_rqst *, struct xdr_stream *, void *);
>  typedef __be32 (*callback_encode_res_t)(struct svc_rqst *, struct xdr_stream *, void *);

All 3 patches acked...

-- 
Trond Myklebust
Linux NFS client maintainer

NetApp
Trond.Myklebust@netapp.com
www.netapp.com

RE: [PATCH 3/3] SQUASHME: nfs41: get rid of READ64 in callback_xdr.c

[Halevy, Benny]

> All 3 patches acked...

I've squashed-in all our fixes to produced a cleaned up version
of the patchset, rebased onto v2.6.30.
It is available on
git://linux-nfs.org/~bhalevy/linux-pnfs nfs41-for-2.6.31

Thanks!

Benny