commit 1013e2ea88384da2e7326f40047bbc92deb9e516 Author: Marc Eshel <eshel@xxxxxxxxxxxxxxx> 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 <eshel@xxxxxxxxxx> --- 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" <Trond.Myklebust@xxxxxxxxxx> To: Marc Eshel/Almaden/IBM@IBMUS, Cc: "J. Bruce Fields" <bfields@xxxxxxxxxx>, "linux-nfs@xxxxxxxxxxxxxxx" <linux-nfs@xxxxxxxxxxxxxxx>, "linux-nfs-owner@xxxxxxxxxxxxxxx" <linux-nfs-owner@xxxxxxxxxxxxxxx> 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@xxxxxxxxxx] Sent: Saturday, December 08, 2012 12:33 AM To: Myklebust, Trond Cc: J. Bruce Fields; linux-nfs@xxxxxxxxxxxxxxx; linux-nfs-owner@xxxxxxxxxxxxxxx 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 From: Marc Eshel/Almaden/IBM To: "Trond Myklebust" <Trond.Myklebust@xxxxxxxxxx>, "J. Bruce Fields" <bfields@xxxxxxxxxx>, Cc: linux-nfs-owner@xxxxxxxxxxxxxxx, linux-nfs@xxxxxxxxxxxxxxx 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, }; ��.n��������+%������w��{.n�����{��w���jg��������ݢj����G�������j:+v���w�m������w�������h�����٥