s390x: fix condition to choose correct function
Subsystems (2)
PATCH 1/1 s390x: fix condition to choose correct function
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.
--- fs/cifs/cifsfs.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/cifs/cifsfs.h +1 -1
@@ -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) {
Signature · 1 line
2.6.2
Steve French
Appliedmerged into cifs-2.6.git
Looks like alpha has a similar problem though
Quoted 33 lines · Yadan Fan
This issue is involved from commit
02323db17e3a7("cifs: fixcifs_uniqueid_to_ino_tnot to ever return 0"), whenBITS_PER_LONGis 64 on s390x, the correspondingcifs_uniqueid_to_ino_t()function will cast 64-bit fileid to 32-bit by using (ino_t)fileid, becauseino_t(typdefed__kernel_ino_t) is int type.Signed-off-by Yadan Fan <[email protected]>--- fs/cifs/cifsfs.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)fs/cifs/cifsfs.h +0
-0@@ -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. */fs/cifs/cifsfs.h +1
-2-#if BITS_PER_LONG ==64 +#if BITS_PER_LONG ==64 && !defined(CONFIG_S390 )static inline ino_t cifs_uniqueid_to_ino_t (u64 fileid) { --2.6.2
--
To unsubscribe from this list: send the line "unsubscribe linux-cifs" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Signature · 3 lines
Thanks, Steve
Steve French
Appliedmerged into cifs-2.6.git
Looks like alpha has a similar problem though
Quoted 31 lines · Yadan Fan
This issue is involved from commit
02323db17e3a7("cifs: fixcifs_uniqueid_to_ino_tnot to ever return 0"), whenBITS_PER_LONGis 64 on s390x, the correspondingcifs_uniqueid_to_ino_t()function will cast 64-bit fileid to 32-bit by using (ino_t)fileid, becauseino_t(typdefed__kernel_ino_t) is int type.Signed-off-by Yadan Fan <ydfan-IBi9RG/[email protected]>--- fs/cifs/cifsfs.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)fs/cifs/cifsfs.h +1
-2@@ -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) { --2.6.2
--
To unsubscribe from this list: send the line "unsubscribe linux-cifs" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
Signature · 3 lines
Thanks, Steve