From patchwork Tue Mar 1 00:04:12 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve French X-Patchwork-Id: 8460611 Return-Path: X-Original-To: patchwork-cifs-client@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 3B0339F2F0 for ; Tue, 1 Mar 2016 00:04:31 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 3CB2D20166 for ; Tue, 1 Mar 2016 00:04:30 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 6960320154 for ; Tue, 1 Mar 2016 00:04:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750779AbcCAAE2 (ORCPT ); Mon, 29 Feb 2016 19:04:28 -0500 Received: from mail-oi0-f52.google.com ([209.85.218.52]:36042 "EHLO mail-oi0-f52.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750763AbcCAAE1 (ORCPT ); Mon, 29 Feb 2016 19:04:27 -0500 Received: by mail-oi0-f52.google.com with SMTP id k67so60487644oia.3; Mon, 29 Feb 2016 16:04:27 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=vOcIB5ZIe8Oy9yFmCPIblPzob6O39dd6Lz4fKzxxKqs=; b=AII48OEPLhMNvq2x/nro5xPc8FEzGcqerzvCMIfBf/pWRguSve/6vpfh2Riy8ohSck APkVhltiPQvfKlkuL4ePx0ktnXY4scxkuev+/sROjK6PBuCWb4KFcC1E2ibV2018Ph0L a2bx0tIxDoIBjbwFuI7UtpBtaZ/Vos/OrkzSLJm1Zr+eXY1v/GDSL05P/w1DhHnEJLvV K8+dzulp5vKCpCXMP42ob4rDlubEZHp9s3QCIYdbV/pyEQ7E9HENYlL6zJLNtufa8o0z OrvTQ+ghVh5gbWOZx6Y5viBOiVuIrUhMO0va63k8i1fNhIW7AzFHsfbtkuK5o/WuS7Jo q7vg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=vOcIB5ZIe8Oy9yFmCPIblPzob6O39dd6Lz4fKzxxKqs=; b=I7g4zeW/nJKSlKoK5Nz3VjvjtwKJ0QdZJG9nR4RybMCpAOiJKUIYNXdk37yw1JXp6A OnCytAHYi9l9xhEahpwtkiOb/dObqT/vFmbponexq0tDoIVH0q8muvJW5S/6RRL17Fdg ClcazsqIPAyQ5JysOhmUZ1/o65Z7n5QCxRPiJHJ6o8VAWGVWenbaJ5yWJaf36Vv0uWqg SIY6r2gswhaYx4UNnktqgYqfd7mRaBt47bWM2kT4mF9p7Yfrcgd8PZnBmehQsTFxOLug oeKYZNwxh6hvIZw/6RPEK/WiQzYiKm1+I6t/CZGGsHOaKI0nnzEPhPdLSFPvX7csFmgB GqIA== X-Gm-Message-State: AD7BkJJFP1A7pbKLMS6qYSFy18gOrg0tHt5vPhv989FD6v8M1oT7B1d3hfve05jeun0fng== X-Received: by 10.202.91.196 with SMTP id p187mr13508685oib.39.1456790666917; Mon, 29 Feb 2016 16:04:26 -0800 (PST) Received: from ubuntu.localdomain (cpe-68-203-16-26.austin.res.rr.com. [68.203.16.26]) by smtp.gmail.com with ESMTPSA id x144sm19769398oif.23.2016.02.29.16.04.25 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 29 Feb 2016 16:04:25 -0800 (PST) From: Steve French To: linux-cifs@vger.kernel.org Cc: Yadan Fan , Steve French , stable 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> X-Mailer: git-send-email 1.9.1 In-Reply-To: References: Sender: linux-cifs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-cifs@vger.kernel.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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) {