| Message ID | 1456790652-92638-1-git-send-email-smfrench@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Yadan, I updated the patch to fix whitespace problems and made trivial changes to commit description. Would you doublecheck that it is what you want? Patch is merged into cifs-2.6.git On Mon, Feb 29, 2016 at 6:04 PM, Steve French <smfrench@gmail.com> wrote: > From: Yadan Fan <ydfan@suse.com> > > This issue is involved from commit 02323db17e3a7 ("cifs: fix > cifs_uniqueid_to_ino_t not to ever return 0"), when BITS_PER_LONG > is 64 on s390x, the corresponding cifs_uniqueid_to_ino_t() > function will cast 64-bit fileid to 32-bit by using (ino_t)fileid, > because ino_t (typdefed __kernel_ino_t) is int type. > > Signed-off-by: Yadan Fan <ydfan@suse.com> > Signed-off-by: Steve French <smfrench@gmail.com> > CC: stable <stable@vger.kernel.org> > --- > fs/cifs/cifsfs.h | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/fs/cifs/cifsfs.h b/fs/cifs/cifsfs.h > index 68c4547..02dcbe1 100644 > --- a/fs/cifs/cifsfs.h > +++ b/fs/cifs/cifsfs.h > @@ -31,7 +31,7 @@ > * so that it will fit. We use hash_64 to convert the value to 31 bits, and > * then add 1, to ensure that we don't end up with a 0 as the value. > */ > -#if BITS_PER_LONG == 64 > +#if BITS_PER_LONG == 64 && !defined(CONFIG_S390) > static inline ino_t > cifs_uniqueid_to_ino_t(u64 fileid) > { > -- > 1.9.1 >
Ignore the last one I sent - it was the wrong one. The correct version (the one I merged into cifs-2.6.git) is attached. On Mon, Feb 29, 2016 at 6:05 PM, Steve French <smfrench@gmail.com> wrote: > Yadan, > I updated the patch to fix whitespace problems and made trivial > changes to commit description. Would you doublecheck that it is what > you want? > > Patch is merged into cifs-2.6.git > > On Mon, Feb 29, 2016 at 6:04 PM, Steve French <smfrench@gmail.com> wrote: >> From: Yadan Fan <ydfan@suse.com> >> >> This issue is involved from commit 02323db17e3a7 ("cifs: fix >> cifs_uniqueid_to_ino_t not to ever return 0"), when BITS_PER_LONG >> is 64 on s390x, the corresponding cifs_uniqueid_to_ino_t() >> function will cast 64-bit fileid to 32-bit by using (ino_t)fileid, >> because ino_t (typdefed __kernel_ino_t) is int type. >> >> Signed-off-by: Yadan Fan <ydfan@suse.com> >> Signed-off-by: Steve French <smfrench@gmail.com> >> CC: stable <stable@vger.kernel.org> >> --- >> fs/cifs/cifsfs.h | 2 +- >> 1 file changed, 1 insertion(+), 1 deletion(-) >> >> diff --git a/fs/cifs/cifsfs.h b/fs/cifs/cifsfs.h >> index 68c4547..02dcbe1 100644 >> --- a/fs/cifs/cifsfs.h >> +++ b/fs/cifs/cifsfs.h >> @@ -31,7 +31,7 @@ >> * so that it will fit. We use hash_64 to convert the value to 31 bits, and >> * then add 1, to ensure that we don't end up with a 0 as the value. >> */ >> -#if BITS_PER_LONG == 64 >> +#if BITS_PER_LONG == 64 && !defined(CONFIG_S390) >> static inline ino_t >> cifs_uniqueid_to_ino_t(u64 fileid) >> { >> -- >> 1.9.1 >> > > > > -- > Thanks, > > Steve
diff --git a/fs/cifs/cifsfs.h b/fs/cifs/cifsfs.h index 68c4547..02dcbe1 100644 --- a/fs/cifs/cifsfs.h +++ b/fs/cifs/cifsfs.h @@ -31,7 +31,7 @@ * so that it will fit. We use hash_64 to convert the value to 31 bits, and * then add 1, to ensure that we don't end up with a 0 as the value. */ -#if BITS_PER_LONG == 64 +#if BITS_PER_LONG == 64 && !defined(CONFIG_S390) static inline ino_t cifs_uniqueid_to_ino_t(u64 fileid) {