From patchwork Thu Dec 2 17:58:43 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Frank Filz X-Patchwork-Id: 375471 X-Patchwork-Delegate: Trond.Myklebust@netapp.com Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id oB2HwsDG001995 for ; Thu, 2 Dec 2010 17:58:54 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757942Ab0LBR6u (ORCPT ); Thu, 2 Dec 2010 12:58:50 -0500 Received: from e34.co.us.ibm.com ([32.97.110.152]:40944 "EHLO e34.co.us.ibm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757879Ab0LBR6u (ORCPT ); Thu, 2 Dec 2010 12:58:50 -0500 Received: from d03relay03.boulder.ibm.com (d03relay03.boulder.ibm.com [9.17.195.228]) by e34.co.us.ibm.com (8.14.4/8.13.1) with ESMTP id oB2HmR29013170 for ; Thu, 2 Dec 2010 10:48:27 -0700 Received: from d03av02.boulder.ibm.com (d03av02.boulder.ibm.com [9.17.195.168]) by d03relay03.boulder.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id oB2HwlC8106634 for ; Thu, 2 Dec 2010 10:58:47 -0700 Received: from d03av02.boulder.ibm.com (loopback [127.0.0.1]) by d03av02.boulder.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id oB2HwkT6001717 for ; Thu, 2 Dec 2010 10:58:47 -0700 Received: from [9.65.108.225] (sig-9-65-108-225.mts.ibm.com [9.65.108.225]) by d03av02.boulder.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id oB2Hwign001580; Thu, 2 Dec 2010 10:58:45 -0700 Subject: [PATCH] (updated) Fix nfs_compat_user_ino64 so it doesn't cause problems if bit 31 or 63 are set in filei From: Frank Filz To: NFS List Cc: ffilz@us.ibm.com Date: Thu, 02 Dec 2010 09:58:43 -0800 Message-Id: <1291312723.5075.25.camel@KPMH461.ibm.com> Mime-Version: 1.0 X-Mailer: Evolution 2.12.3 (2.12.3-19.el5) Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter1.kernel.org [140.211.167.41]); Thu, 02 Dec 2010 17:58:55 +0000 (UTC) diff --git a/fs/nfs/inode.c b/fs/nfs/inode.c index 314f571..7fe18a0 100644 --- a/fs/nfs/inode.c +++ b/fs/nfs/inode.c @@ -89,7 +89,11 @@ int nfs_wait_bit_killable(void *word) */ u64 nfs_compat_user_ino64(u64 fileid) { - int ino; +#ifdef CONIFG_COMPAT + compat_ulong_t ino; +#else + unsigned long ino; +#endif if (enable_ino64) return fileid;