diff mbox

notify_deviceid_type4

Message ID OF0F29D082.A262ED54-ON88257ACE.0000B379-88257ACE.0000F121@us.ibm.com (mailing list archive)
State New, archived
Headers show

Commit Message

Marc Eshel Dec. 8, 2012, 12:10 a.m. UTC 
commit 1013e2ea88384da2e7326f40047bbc92deb9e516
Author: Marc Eshel <eshel@almaden.ibm.com>
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@us.ibm.com>

---




From:        Marc Eshel/Almaden/IBM 

To:        "Trond Myklebust" <Trond.Myklebust@netapp.com>, "J. Bruce 
Fields" <bfields@redhat.com>, 
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, 
};

Comments

Jim Rees Dec. 8, 2012, 1:24 a.m. UTC | #1 
Marc Eshel wrote:

  commit 1013e2ea88384da2e7326f40047bbc92deb9e516
  Author: Marc Eshel <eshel@almaden.ibm.com>
  Date:   Fri Dec 7 15:58:07 2012 -0800
  
  Change definition of notify_deviceid_type4 to correspond to the NFSv4.1 
  spec.

Doesn't apply for me:

% git am ~/Mail/tmp/89
Applying: RE: notify_deviceid_type4
fatal: corrupt patch at line 9
Patch failed at 0001 RE: notify_deviceid_type4
When you have resolved this problem run "git am --resolved".
If you would prefer to skip this patch, instead run "git am --skip".
To restore the original branch and stop patching run "git am --abort".
--
To unsubscribe from this list: send the line "unsubscribe linux-nfs" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

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@netapp.com>
To:     Marc Eshel/Almaden/IBM@IBMUS, 
Cc:     "J. Bruce Fields" <bfields@redhat.com>, 
"linux-nfs@vger.kernel.org" <linux-nfs@vger.kernel.org>, 
"linux-nfs-owner@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