On 05/16/2013 11:56 AM, Steve Dickson wrote:
> From: Steve Dickson <steved@xxxxxxxxxx>
>
> This enable NFSv4.2 support. To enable this code the
> CONFIG_NFS_V4_2 Kconfig define needs to be set and
> the -o v4.2 mount option need to be used.
>
> Signed-off-by: Steve Dickson <steved@xxxxxxxxxx>
> ---
> fs/nfs/Kconfig | 9 +++++++++
> fs/nfs/callback.c | 1 +
> fs/nfs/callback_xdr.c | 6 +++---
> fs/nfs/nfs4client.c | 5 +++++
> fs/nfs/nfs4proc.c | 15 +++++++++++++++
> fs/nfs/super.c | 7 ++++++-
> include/linux/nfs4.h | 4 ++++
> 7 files changed, 43 insertions(+), 4 deletions(-)
>
8< snip >8
> diff --git a/include/linux/nfs4.h b/include/linux/nfs4.h
> index 7764aca..4204600 100644
> --- a/include/linux/nfs4.h
> +++ b/include/linux/nfs4.h
> @@ -399,11 +399,15 @@ enum lock_type4 {
> #define NFS4_VERSION 4
> #define NFS4_MINOR_VERSION 0
>
> +#if defined(CONFIG_NFS_V4_2)
> +#define NFS4_MAX_MINOR_VERSION 2
> +#else
> #if defined(CONFIG_NFS_V4_1)
> #define NFS4_MAX_MINOR_VERSION 1
> #else
> #define NFS4_MAX_MINOR_VERSION 0
> #endif /* CONFIG_NFS_V4_1 */
> +#endif /* CONFIG_NFS_V4_2 */
Could this be done with a #elif so we don't need the nested endif-s?
~ Bryan
>
> #define NFS4_DEBUG 1
>
>
--
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
