[pnfs] pnfs 2.6-latest: include pnfs_xdr.h after its dependencies

[Trond Myklebust]

On Thu, 2007-11-15 at 16:42 +0200, Benny Halevy wrote:
> Signed-off-by: Benny Halevy <bhalevy at fs1.bhalevy.com>
                               ^^^^^^^^^^^^^^^^^^^^^^^^
Note that for submissions into the mainline kernel, you should really
use your panasas.com address unless, of course, you personally are the
copyright holder for these patches. The reason is that we want to be
able to trace the copyright and/or licenceholders for each patch.

Cheers
  Trond


> ---
>  include/linux/nfs_xdr.h |    7 +++----
>  1 files changed, 3 insertions(+), 4 deletions(-)
> 
> diff --git a/include/linux/nfs_xdr.h b/include/linux/nfs_xdr.h
> index e02c921..b500710 100644
> --- a/include/linux/nfs_xdr.h
> +++ b/include/linux/nfs_xdr.h
> @@ -5,9 +5,6 @@
>  #ifdef CONFIG_NFS_V4_1
>  #include <linux/nfs4_session.h>
>  #endif
> -//#ifdef CONFIG_PNFS
> -//#include <linux/pnfs_xdr.h>
> -//#endif
>  
>  /*
>   * To change the maximum rsize and wsize supported by the NFS client, adjust
> @@ -159,7 +156,6 @@ struct nfs41_sequence_res {
>  	unsigned long		sr_renewal_time;
>  };
>  
> -#if defined(CONFIG_NFS_V4_1)
>  struct nfs4_get_lease_time_args {
>  	struct nfs41_sequence_args 	la_seq_args;
>  };
> @@ -168,6 +164,9 @@ struct nfs4_get_lease_time_res {
>  	struct nfs_fsinfo *		lr_fsinfo;
>  	struct nfs41_sequence_res 	lr_seq_res;
>  };
> +
> +#ifdef CONFIG_PNFS
> +#include <linux/pnfs_xdr.h>
>  #endif
>  
>  #endif	/* CONFIG_NFS_V4_1 */