diff options
author | Yadan Fan <ydfan@novell.com> | 2016-02-29 14:44:57 +0800 |
---|---|---|
committer | Sasha Levin <sasha.levin@oracle.com> | 2016-03-11 09:45:23 -0500 |
commit | 6303c5122e28d378ccd755310307b938ad76e9ae (patch) | |
tree | b22c78616c66727d530233f742b5d5f69ee1d918 /arch/arm | |
parent | 51d64a86ef632d662f461f64a2a6f24824229b63 (diff) |
Fix cifs_uniqueid_to_ino_t() function for s390x
[ Upstream commit 1ee9f4bd1a97026a7b2d7ae9f1f74b45680d0003 ]
This issue is caused by 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.
It's defined in arch/s390/include/uapi/asm/posix_types.h
#ifndef __s390x__
typedef unsigned long __kernel_ino_t;
...
#else /* __s390x__ */
typedef unsigned int __kernel_ino_t;
So the #ifdef condition is wrong for s390x, we can just still use
one cifs_uniqueid_to_ino_t() function with comparing sizeof(ino_t)
and sizeof(u64) to choose the correct execution accordingly.
Signed-off-by: Yadan Fan <ydfan@suse.com>
CC: stable <stable@vger.kernel.org>
Signed-off-by: Steve French <smfrench@gmail.com>
Signed-off-by: Sasha Levin <sasha.levin@oracle.com>
Diffstat (limited to 'arch/arm')
0 files changed, 0 insertions, 0 deletions