* [PATCH 1/3] s390x: fix condition to choose correct function @ 2016-03-01 0:04 ` Steve French 0 siblings, 0 replies; 9+ messages in thread From: Steve French @ 2016-03-01 0:04 UTC (permalink / raw) To: linux-cifs-u79uwXL29TY76Z2rM5mHXA; +Cc: Yadan Fan, Steve French, stable From: Yadan Fan <ydfan-IBi9RG/b67k@public.gmane.org> 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-IBi9RG/b67k@public.gmane.org> Signed-off-by: Steve French <smfrench-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> CC: stable <stable-u79uwXL29TY76Z2rM5mHXA@public.gmane.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 ^ permalink raw reply related [flat|nested] 9+ messages in thread
* [PATCH 1/3] s390x: fix condition to choose correct function @ 2016-03-01 0:04 ` Steve French 0 siblings, 0 replies; 9+ messages in thread From: Steve French @ 2016-03-01 0:04 UTC (permalink / raw) To: linux-cifs; +Cc: Yadan Fan, Steve French, stable 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 ^ permalink raw reply related [flat|nested] 9+ messages in thread
[parent not found: <1456790652-92638-1-git-send-email-smfrench-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>]
* Re: [PATCH 1/3] s390x: fix condition to choose correct function 2016-03-01 0:04 ` Steve French @ 2016-03-01 0:05 ` Steve French -1 siblings, 0 replies; 9+ messages in thread From: Steve French @ 2016-03-01 0:05 UTC (permalink / raw) To: linux-cifs-u79uwXL29TY76Z2rM5mHXA@public.gmane.org Cc: Yadan Fan, Steve French, stable 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-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> wrote: > From: Yadan Fan <ydfan-IBi9RG/b67k@public.gmane.org> > > 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-IBi9RG/b67k@public.gmane.org> > Signed-off-by: Steve French <smfrench-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> > CC: stable <stable-u79uwXL29TY76Z2rM5mHXA@public.gmane.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 ^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH 1/3] s390x: fix condition to choose correct function @ 2016-03-01 0:05 ` Steve French 0 siblings, 0 replies; 9+ messages in thread From: Steve French @ 2016-03-01 0:05 UTC (permalink / raw) To: linux-cifs@vger.kernel.org; +Cc: Yadan Fan, Steve French, stable 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 ^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH 1/3] s390x: fix condition to choose correct function 2016-03-01 0:05 ` Steve French (?) @ 2016-03-01 0:09 ` Steve French -1 siblings, 0 replies; 9+ messages in thread From: Steve French @ 2016-03-01 0:09 UTC (permalink / raw) To: linux-cifs@vger.kernel.org; +Cc: Yadan Fan, Steve French, stable [-- Attachment #1: Type: text/plain, Size: 1601 bytes --] 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 -- Thanks, Steve [-- Attachment #2: 0001-Fix-cifs_uniqueid_to_ino_t-function-for-s390x.patch --] [-- Type: application/mbox, Size: 1909 bytes --] ^ permalink raw reply [flat|nested] 9+ messages in thread
* [PATCH 2/2] CIFS: Fix duplicate line introduced by clone_file_range patch [not found] <smfrench@gmail.com> 2016-03-01 0:04 ` Steve French @ 2016-03-01 0:10 ` Steve French [not found] ` <1456791058-92940-1-git-send-email-smfrench-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> 1 sibling, 1 reply; 9+ messages in thread From: Steve French @ 2016-03-01 0:10 UTC (permalink / raw) To: linux-cifs-u79uwXL29TY76Z2rM5mHXA Cc: Steve French, Steve French, Christoph Hellwig Commit 04b38d601239b4 ("vfs: pull btrfs clone API to vfs layer") added a duplicated line (in cifsfs.c) which causes a sparse compile warning. Signed-off-by: Steve French <steve.french-7I+n7zu2hftEKMMhf/gKZA@public.gmane.org> CC: Christoph Hellwig <hch-jcswGhMUV9g@public.gmane.org> --- fs/cifs/cifsfs.c | 1 - 1 file changed, 1 deletion(-) diff --git a/fs/cifs/cifsfs.c b/fs/cifs/cifsfs.c index c48ca13..2eea403 100644 --- a/fs/cifs/cifsfs.c +++ b/fs/cifs/cifsfs.c @@ -1013,7 +1013,6 @@ const struct file_operations cifs_file_strict_ops = { .llseek = cifs_llseek, .unlocked_ioctl = cifs_ioctl, .clone_file_range = cifs_clone_file_range, - .clone_file_range = cifs_clone_file_range, .setlease = cifs_setlease, .fallocate = cifs_fallocate, }; -- 1.9.1 ^ permalink raw reply related [flat|nested] 9+ messages in thread
[parent not found: <1456791058-92940-1-git-send-email-smfrench-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>]
* Fwd: [PATCH 2/2] CIFS: Fix duplicate line introduced by clone_file_range patch 2016-03-01 0:10 ` [PATCH 2/2] CIFS: Fix duplicate line introduced by clone_file_range patch Steve French @ 2016-03-01 0:11 ` Steve French 0 siblings, 0 replies; 9+ messages in thread From: Steve French @ 2016-03-01 0:11 UTC (permalink / raw) To: linux-fsdevel, linux-cifs-u79uwXL29TY76Z2rM5mHXA@public.gmane.org Merged into cifs-2.6.git ---------- Forwarded message ---------- From: Steve French <smfrench-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> Date: Mon, Feb 29, 2016 at 6:10 PM Subject: [PATCH 2/2] CIFS: Fix duplicate line introduced by clone_file_range patch To: linux-cifs-u79uwXL29TY76Z2rM5mHXA@public.gmane.org Cc: Steve French <smfrench-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>, Steve French <steve.french-7I+n7zu2hftEKMMhf/gKZA@public.gmane.org>, Christoph Hellwig <hch-jcswGhMUV9g@public.gmane.org> Commit 04b38d601239b4 ("vfs: pull btrfs clone API to vfs layer") added a duplicated line (in cifsfs.c) which causes a sparse compile warning. Signed-off-by: Steve French <steve.french-7I+n7zu2hftEKMMhf/gKZA@public.gmane.org> CC: Christoph Hellwig <hch-jcswGhMUV9g@public.gmane.org> --- fs/cifs/cifsfs.c | 1 - 1 file changed, 1 deletion(-) diff --git a/fs/cifs/cifsfs.c b/fs/cifs/cifsfs.c index c48ca13..2eea403 100644 --- a/fs/cifs/cifsfs.c +++ b/fs/cifs/cifsfs.c @@ -1013,7 +1013,6 @@ const struct file_operations cifs_file_strict_ops = { .llseek = cifs_llseek, .unlocked_ioctl = cifs_ioctl, .clone_file_range = cifs_clone_file_range, - .clone_file_range = cifs_clone_file_range, .setlease = cifs_setlease, .fallocate = cifs_fallocate, }; -- 1.9.1 -- Thanks, Steve ^ permalink raw reply related [flat|nested] 9+ messages in thread
* Fwd: [PATCH 2/2] CIFS: Fix duplicate line introduced by clone_file_range patch @ 2016-03-01 0:11 ` Steve French 0 siblings, 0 replies; 9+ messages in thread From: Steve French @ 2016-03-01 0:11 UTC (permalink / raw) To: linux-fsdevel, linux-cifs@vger.kernel.org Merged into cifs-2.6.git ---------- Forwarded message ---------- From: Steve French <smfrench@gmail.com> Date: Mon, Feb 29, 2016 at 6:10 PM Subject: [PATCH 2/2] CIFS: Fix duplicate line introduced by clone_file_range patch To: linux-cifs@vger.kernel.org Cc: Steve French <smfrench@gmail.com>, Steve French <steve.french@primarydata.com>, Christoph Hellwig <hch@lst.de> Commit 04b38d601239b4 ("vfs: pull btrfs clone API to vfs layer") added a duplicated line (in cifsfs.c) which causes a sparse compile warning. Signed-off-by: Steve French <steve.french@primarydata.com> CC: Christoph Hellwig <hch@lst.de> --- fs/cifs/cifsfs.c | 1 - 1 file changed, 1 deletion(-) diff --git a/fs/cifs/cifsfs.c b/fs/cifs/cifsfs.c index c48ca13..2eea403 100644 --- a/fs/cifs/cifsfs.c +++ b/fs/cifs/cifsfs.c @@ -1013,7 +1013,6 @@ const struct file_operations cifs_file_strict_ops = { .llseek = cifs_llseek, .unlocked_ioctl = cifs_ioctl, .clone_file_range = cifs_clone_file_range, - .clone_file_range = cifs_clone_file_range, .setlease = cifs_setlease, .fallocate = cifs_fallocate, }; -- 1.9.1 -- Thanks, Steve ^ permalink raw reply related [flat|nested] 9+ messages in thread
* Re: [PATCH 2/2] CIFS: Fix duplicate line introduced by clone_file_range patch [not found] ` <1456791058-92940-1-git-send-email-smfrench-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> 2016-03-01 0:11 ` Steve French @ 2016-03-01 6:50 ` Christoph Hellwig 1 sibling, 0 replies; 9+ messages in thread From: Christoph Hellwig @ 2016-03-01 6:50 UTC (permalink / raw) To: Steve French Cc: linux-cifs-u79uwXL29TY76Z2rM5mHXA, Steve French, Christoph Hellwig On Mon, Feb 29, 2016 at 06:10:58PM -0600, Steve French wrote: > Commit 04b38d601239b4 ("vfs: pull btrfs clone API to vfs layer") > added a duplicated line (in cifsfs.c) which causes a sparse compile > warning. > > Signed-off-by: Steve French <steve.french-7I+n7zu2hftEKMMhf/gKZA@public.gmane.org> > CC: Christoph Hellwig <hch-jcswGhMUV9g@public.gmane.org> Oops. The fix looks fine to me: Reviewed-by: Christoph Hellwig <hch-jcswGhMUV9g@public.gmane.org> ^ permalink raw reply [flat|nested] 9+ messages in thread
end of thread, other threads:[~2016-03-01 6:50 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
[not found] <smfrench@gmail.com>
2016-03-01 0:04 ` [PATCH 1/3] s390x: fix condition to choose correct function Steve French
2016-03-01 0:04 ` Steve French
[not found] ` <1456790652-92638-1-git-send-email-smfrench-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2016-03-01 0:05 ` Steve French
2016-03-01 0:05 ` Steve French
2016-03-01 0:09 ` Steve French
2016-03-01 0:10 ` [PATCH 2/2] CIFS: Fix duplicate line introduced by clone_file_range patch Steve French
[not found] ` <1456791058-92940-1-git-send-email-smfrench-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2016-03-01 0:11 ` Fwd: " Steve French
2016-03-01 0:11 ` Steve French
2016-03-01 6:50 ` Christoph Hellwig
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.