From mboxrd@z Thu Jan 1 00:00:00 1970 From: Steve French Subject: [PATCH 1/3] s390x: fix condition to choose correct function Date: Mon, 29 Feb 2016 18:04:12 -0600 Message-ID: <1456790652-92638-1-git-send-email-smfrench@gmail.com> References: Cc: Yadan Fan , Steve French , stable To: linux-cifs-u79uwXL29TY76Z2rM5mHXA@public.gmane.org Return-path: In-Reply-To: Sender: linux-cifs-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org List-ID: From: Yadan Fan 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 Signed-off-by: Steve French CC: stable --- 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