From patchwork Sat Dec 8 00:10:39 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Marc Eshel X-Patchwork-Id: 1852241 Return-Path: X-Original-To: patchwork-linux-nfs@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id EAB44DF2EE for ; Sat, 8 Dec 2012 00:11:14 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757242Ab2LHALN (ORCPT ); Fri, 7 Dec 2012 19:11:13 -0500 Received: from e9.ny.us.ibm.com ([32.97.182.139]:39364 "EHLO e9.ny.us.ibm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757186Ab2LHALN (ORCPT ); Fri, 7 Dec 2012 19:11:13 -0500 Received: from /spool/local by e9.ny.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Fri, 7 Dec 2012 19:11:12 -0500 Received: from d01dlp02.pok.ibm.com (9.56.250.167) by e9.ny.us.ibm.com (192.168.1.109) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Fri, 7 Dec 2012 19:11:10 -0500 Received: from d01relay03.pok.ibm.com (d01relay03.pok.ibm.com [9.56.227.235]) by d01dlp02.pok.ibm.com (Postfix) with ESMTP id 3E2EE6E8047 for ; Fri, 7 Dec 2012 19:11:09 -0500 (EST) Received: from d01av03.pok.ibm.com (d01av03.pok.ibm.com [9.56.224.217]) by d01relay03.pok.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id qB80B9TS313264 for ; Fri, 7 Dec 2012 19:11:09 -0500 Received: from d01av03.pok.ibm.com (loopback [127.0.0.1]) by d01av03.pok.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id qB80B8Au022558 for ; Fri, 7 Dec 2012 22:11:09 -0200 Received: from d01ml604.pok.ibm.com (d01ml604.pok.ibm.com [9.63.8.151]) by d01av03.pok.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id qB80B8dd022555; Fri, 7 Dec 2012 22:11:08 -0200 In-Reply-To: <4FA345DA4F4AE44899BD2B03EEEC2FA90B33D909@SACEXCMBX04-PRD.hq.netapp.com> References: <4FA345DA4F4AE44899BD2B03EEEC2FA90B33D909@SACEXCMBX04-PRD.hq.netapp.com> To: "Myklebust, Trond" Cc: "linux-nfs@vger.kernel.org" MIME-Version: 1.0 Subject: RE: notify_deviceid_type4 X-KeepSent: 0F29D082:A262ED54-88257ACE:0000B379; type=4; name=$KeepSent X-Mailer: Lotus Notes Release 8.5.3 September 15, 2011 Message-ID: From: Marc Eshel Date: Fri, 7 Dec 2012 16:10:39 -0800 X-MIMETrack: Serialize by Router on D01ML604/01/M/IBM(Release 8.5.3FP2 ZX853FP2HF2|October 8, 2012) at 12/07/2012 19:11:07, Serialize complete at 12/07/2012 19:11:07 X-Content-Scanned: Fidelis XPS MAILER x-cbid: 12120800-7182-0000-0000-000003A17A23 Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org commit 1013e2ea88384da2e7326f40047bbc92deb9e516 Author: Marc Eshel Date: Fri Dec 7 15:58:07 2012 -0800 Change definition of notify_deviceid_type4 to correspond to the NFSv4.1 spec. Signed-off-by: Marc Eshel --- From: Marc Eshel/Almaden/IBM To: "Trond Myklebust" , "J. Bruce Fields" , Cc: linux-nfs-owner@vger.kernel.org, linux-nfs@vger.kernel.org Date: 11/30/2012 09:54 PM Subject: notify_deviceid_type4 The spec defines notify_deviceid_type4 as: 20.12.1. ARGUMENT /* * Device notification types. */ enum notify_deviceid_type4 { NOTIFY_DEVICEID4_CHANGE = 1, NOTIFY_DEVICEID4_DELETE = 2 }; but the Linux code in nfs4.h has, is that going to be fixed? enum pnfs_notify_deviceid_type4 { NOTIFY_DEVICEID4_CHANGE = 1 << 1, NOTIFY_DEVICEID4_DELETE = 1 << 2, }; diff --git a/include/linux/nfs4.h b/include/linux/nfs4.h index 59cc833..ad32df5 100644 --- a/include/linux/nfs4.h +++ b/include/linux/nfs4.h @@ -499,8 +499,8 @@ enum pnfs_iomode { }; enum pnfs_notify_deviceid_type4 { - NOTIFY_DEVICEID4_CHANGE = 1 << 1, - NOTIFY_DEVICEID4_DELETE = 1 << 2, + NOTIFY_DEVICEID4_CHANGE = 1, + NOTIFY_DEVICEID4_DELETE = 2, }; #define NFL4_UFLG_MASK 0x0000003F From: "Myklebust, Trond" To: Marc Eshel/Almaden/IBM@IBMUS, Cc: "J. Bruce Fields" , "linux-nfs@vger.kernel.org" , "linux-nfs-owner@vger.kernel.org" Date: 12/07/2012 03:45 PM Subject: RE: notify_deviceid_type4 Hi Marc, I’ve been waiting for a patch from you for this (I saw your original bug report). Could you please resend with a formal changelog entry and signed-off-by line? I know that would make your legal colleagues in IBM very happy. J Cheers Trond From: Marc Eshel [mailto:eshel@us.ibm.com] Sent: Saturday, December 08, 2012 12:33 AM To: Myklebust, Trond Cc: J. Bruce Fields; linux-nfs@vger.kernel.org; linux-nfs-owner@vger.kernel.org Subject: Re: notify_deviceid_type4 Trond, can you please apply the following patch so we are in compliance with the spec. Thanks, Marc. diff --git a/include/linux/nfs4.h b/include/linux/nfs4.h index 59cc833..ad32df5 100644 --- a/include/linux/nfs4.h +++ b/include/linux/nfs4.h @@ -499,8 +499,8 @@ enum pnfs_iomode { }; enum pnfs_notify_deviceid_type4 { - NOTIFY_DEVICEID4_CHANGE = 1 << 1, - NOTIFY_DEVICEID4_DELETE = 1 << 2, + NOTIFY_DEVICEID4_CHANGE = 1, + NOTIFY_DEVICEID4_DELETE = 2, }; #define NFL4_UFLG_MASK 0x0000003F