2016-06-05 09:23:50

by Geert Uytterhoeven

Subject: [PATCH] nfds: Fix NFSD_MDS_PR_KEY on 32-bit by adding ULL postfix

On 32-bit:

fs/nfsd/blocklayout.c: In function ‘nfsd4_block_get_device_info_scsi’:
fs/nfsd/blocklayout.c:337: warning: integer constant is too large for ‘long’ type
fs/nfsd/blocklayout.c:344: warning: integer constant is too large for ‘long’ type
fs/nfsd/blocklayout.c: In function ‘nfsd4_scsi_fence_client’:
fs/nfsd/blocklayout.c:385: warning: integer constant is too large for ‘long’ type

Add the missing "ULL" postfix to 64-bit constant NFSD_MDS_PR_KEY to fix
this.

Fixes: f99d4fbdae6765d0 ("nfsd: add SCSI layout support")
Signed-off-by: Geert Uytterhoeven <[email protected]>
Reviewed-by: Christoph Hellwig <[email protected]>
---
v2:
- Add Reviewed-by.

Despite Bruce's "Thanks, applying for 4.6.--b." on 2016-03-29, this
still hasn't made it into next-20160603.
---
fs/nfsd/blocklayout.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fs/nfsd/blocklayout.c b/fs/nfsd/blocklayout.c
index e55b5242614da7a9..31f3df193bdbb47b 100644
--- a/fs/nfsd/blocklayout.c
+++ b/fs/nfsd/blocklayout.c
@@ -290,7 +290,7 @@ out_free_buf:
return error;
}

-#define NFSD_MDS_PR_KEY 0x0100000000000000
+#define NFSD_MDS_PR_KEY 0x0100000000000000ULL

/*
* We use the client ID as a unique key for the reservations.
--
1.9.1

2016-06-05 10:39:34

by Jeff Layton

Subject: Re: [PATCH] nfds: Fix NFSD_MDS_PR_KEY on 32-bit by adding ULL postfix

On Sun, 2016-06-05 at 11:23 +0200, Geert Uytterhoeven wrote:
> On 32-bit:
>
>     fs/nfsd/blocklayout.c: In function ‘nfsd4_block_get_device_info_scsi’:
>     fs/nfsd/blocklayout.c:337: warning: integer constant is too large for ‘long’ type
>     fs/nfsd/blocklayout.c:344: warning: integer constant is too large for ‘long’ type
>     fs/nfsd/blocklayout.c: In function ‘nfsd4_scsi_fence_client’:
>     fs/nfsd/blocklayout.c:385: warning: integer constant is too large for ‘long’ type
>
> Add the missing "ULL" postfix to 64-bit constant NFSD_MDS_PR_KEY to fix
> this.
>
> Fixes: f99d4fbdae6765d0 ("nfsd: add SCSI layout support")
> Signed-off-by: Geert Uytterhoeven <[email protected]>
> Reviewed-by: Christoph Hellwig <[email protected]>
> ---
> v2:
>   - Add Reviewed-by.
>
> Despite Bruce's "Thanks, applying for 4.6.--b." on 2016-03-29, this
> still hasn't made it into next-20160603.
> ---
>  fs/nfsd/blocklayout.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/fs/nfsd/blocklayout.c b/fs/nfsd/blocklayout.c
> index e55b5242614da7a9..31f3df193bdbb47b 100644
> --- a/fs/nfsd/blocklayout.c
> +++ b/fs/nfsd/blocklayout.c
> @@ -290,7 +290,7 @@ out_free_buf:
>   return error;
>  }
>  
> -#define NFSD_MDS_PR_KEY 0x0100000000000000
> +#define NFSD_MDS_PR_KEY 0x0100000000000000ULL
>  
>  /*
>   * We use the client ID as a unique key for the reservations.

Thanks!

Reviewed-by: Jeff Layton <[email protected]>

2016-06-06 18:57:00

by J. Bruce Fields

Subject: Re: [PATCH] nfds: Fix NFSD_MDS_PR_KEY on 32-bit by adding ULL postfix

On Sun, Jun 05, 2016 at 06:21:43AM -0400, Jeff Layton wrote:
> On Sun, 2016-06-05 at 11:23 +0200, Geert Uytterhoeven wrote:
> > On 32-bit:
> >
> >     fs/nfsd/blocklayout.c: In function ‘nfsd4_block_get_device_info_scsi’:
> >     fs/nfsd/blocklayout.c:337: warning: integer constant is too large for ‘long’ type
> >     fs/nfsd/blocklayout.c:344: warning: integer constant is too large for ‘long’ type
> >     fs/nfsd/blocklayout.c: In function ‘nfsd4_scsi_fence_client’:
> >     fs/nfsd/blocklayout.c:385: warning: integer constant is too large for ‘long’ type
> >
> > Add the missing "ULL" postfix to 64-bit constant NFSD_MDS_PR_KEY to fix
> > this.
> >
> > Fixes: f99d4fbdae6765d0 ("nfsd: add SCSI layout support")
> > Signed-off-by: Geert Uytterhoeven <[email protected]>
> > Reviewed-by: Christoph Hellwig <[email protected]>
> > ---
> > v2:
> >   - Add Reviewed-by.
> >
> > Despite Bruce's "Thanks, applying for 4.6.--b." on 2016-03-29, this
> > still hasn't made it into next-20160603.

Apologies, I did apply that to my local 4.6 branch, but I never
collected any more 4.6 patches, and forgot to send a pull request. I
think I've bugfixes for the current kernel slip by before this way, so I
need a better system.... Thanks for the reminder, feel free to bug me
again if this hasn't gone upstream by next week.

--b.

> > ---
> >  fs/nfsd/blocklayout.c | 2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/fs/nfsd/blocklayout.c b/fs/nfsd/blocklayout.c
> > index e55b5242614da7a9..31f3df193bdbb47b 100644
> > --- a/fs/nfsd/blocklayout.c
> > +++ b/fs/nfsd/blocklayout.c
> > @@ -290,7 +290,7 @@ out_free_buf:
> >   return error;
> >  }
> >  
> > -#define NFSD_MDS_PR_KEY 0x0100000000000000
> > +#define NFSD_MDS_PR_KEY 0x0100000000000000ULL
> >  
> >  /*
> >   * We use the client ID as a unique key for the reservations.
>
> Thanks!
>
> Reviewed-by: Jeff Layton <[email protected]>