From patchwork Thu Dec 2 19:31:23 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Frank Filz X-Patchwork-Id: 375691 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 oB2JhjqG027026 for ; Thu, 2 Dec 2010 19:43:45 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757872Ab0LBTno (ORCPT ); Thu, 2 Dec 2010 14:43:44 -0500 Received: from e5.ny.us.ibm.com ([32.97.182.145]:42727 "EHLO e5.ny.us.ibm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757660Ab0LBTno (ORCPT ); Thu, 2 Dec 2010 14:43:44 -0500 Received: from d01dlp01.pok.ibm.com (d01dlp01.pok.ibm.com [9.56.224.56]) by e5.ny.us.ibm.com (8.14.4/8.13.1) with ESMTP id oB2JKbpl021648 for ; Thu, 2 Dec 2010 14:21:41 -0500 Received: from d01relay07.pok.ibm.com (d01relay07.pok.ibm.com [9.56.227.147]) by d01dlp01.pok.ibm.com (Postfix) with ESMTP id C7FE5729333 for ; Thu, 2 Dec 2010 14:31:31 -0500 (EST) Received: from d01av02.pok.ibm.com (d01av02.pok.ibm.com [9.56.224.216]) by d01relay07.pok.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id oB2JVQYK1818694 for ; Thu, 2 Dec 2010 14:31:26 -0500 Received: from d01av02.pok.ibm.com (loopback [127.0.0.1]) by d01av02.pok.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id oB2JVPsa004799 for ; Thu, 2 Dec 2010 17:31:26 -0200 Received: from [9.49.150.5] (sig-9-49-150-5.mts.ibm.com [9.49.150.5]) by d01av02.pok.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id oB2JVOnp004716; Thu, 2 Dec 2010 17:31:24 -0200 Subject: [PATCH] (try3-resend) Fix nfs_compat_user_ino64 so it doesn't cause problems if bit 31 or 63 are set in fileid From: Frank Filz To: NFS List , Trond Myklebust Cc: ffilz@us.ibm.com Date: Thu, 02 Dec 2010 11:31:23 -0800 Message-Id: <1291318283.4140.6.camel@KPMH461.ibm.com> Mime-Version: 1.0 X-Mailer: Evolution 2.12.3 (2.12.3-19.el5) X-Content-Scanned: Fidelis XPS MAILER 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 19:43:45 +0000 (UTC) diff --git a/fs/nfs/inode.c b/fs/nfs/inode.c index 314f571..bc0b938 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 CONFIG_COMPAT + compat_ulong_t ino; +#else + unsigned long ino; +#endif if (enable_ino64) return fileid;