From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757251AbcBXGrl (ORCPT ); Wed, 24 Feb 2016 01:47:41 -0500 Received: from victor.provo.novell.com ([137.65.250.26]:36090 "EHLO prv3-mh.provo.novell.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750888AbcBXGrk (ORCPT ); Wed, 24 Feb 2016 01:47:40 -0500 From: Yadan Fan To: sfrench@samba.org, linux-cifs@vger.kernel.org Cc: samba-technical@lists.samba.org, linux-kernel@vger.kernel.org, martin.schwidefsky@de.ibm.com, Yadan Fan Subject: [PATCH] s390x: fix condition to choose correct function Date: Wed, 24 Feb 2016 14:45:47 +0800 Message-Id: <1456296347-9665-1-git-send-email-ydfan@suse.com> X-Mailer: git-send-email 2.6.2 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.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 --- 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) { -- 2.6.2