NFSv4: Ensure that we track the NFSv4 lock state in read/write requests.

This patch fixes bugzilla entry 14501:
  https://bugzilla.kernel.org/show_bug.cgi?id=14501

Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>

3 files changed, 14 insertions, 2 deletions

diff --git a/include/linux/nfs_fs.h b/include/linux/nfs_fs.h
index 77c2ae53431c..a9d802615082 100644
--- a/include/linux/nfs_fs.h
+++ b/include/linux/nfs_fs.h
@@ -72,13 +72,20 @@ struct nfs_access_entry {
         int                     mask;
 };
 
+struct nfs_lock_context {
+        atomic_t count;
+        struct list_head list;
+        struct nfs_open_context *open_context;
+        fl_owner_t lockowner;
+        pid_t pid;
+};
+
 struct nfs4_state;
 struct nfs_open_context {
-        atomic_t count;
+        struct nfs_lock_context lock_context;
         struct path path;
         struct rpc_cred *cred;
         struct nfs4_state *state;
-        fl_owner_t lockowner;
         fmode_t mode;
 
         unsigned long flags;
@@ -353,6 +360,8 @@ extern void nfs_setattr_update_inode(struct inode *inode, struct iattr *attr);
 extern struct nfs_open_context *get_nfs_open_context(struct nfs_open_context *ctx);
 extern void put_nfs_open_context(struct nfs_open_context *ctx);
 extern struct nfs_open_context *nfs_find_open_context(struct inode *inode, struct rpc_cred *cred, fmode_t mode);
+extern struct nfs_lock_context *nfs_get_lock_context(struct nfs_open_context *ctx);
+extern void nfs_put_lock_context(struct nfs_lock_context *l_ctx);
 extern u64 nfs_compat_user_ino64(u64 fileid);
 extern void nfs_fattr_init(struct nfs_fattr *fattr);
 
diff --git a/include/linux/nfs_page.h b/include/linux/nfs_page.h
index 3c60685d972b..f8b60e7f4c44 100644
--- a/include/linux/nfs_page.h
+++ b/include/linux/nfs_page.h
@@ -39,6 +39,7 @@ struct nfs_page {
         struct list_head        wb_list;        /* Defines state of page: */
         struct page             *wb_page;       /* page to read in/write out */
         struct nfs_open_context *wb_context;    /* File state context info */
+        struct nfs_lock_context *wb_lock_context;       /* lock context info */
         atomic_t                wb_complete;    /* i/os we're waiting for */
         pgoff_t                 wb_index;       /* Offset >> PAGE_CACHE_SHIFT */
         unsigned int            wb_offset,      /* Offset & ~PAGE_CACHE_MASK */
diff --git a/include/linux/nfs_xdr.h b/include/linux/nfs_xdr.h
index a319cb926abf..87202c7026e3 100644
--- a/include/linux/nfs_xdr.h
+++ b/include/linux/nfs_xdr.h
@@ -334,6 +334,7 @@ struct nfs4_delegreturnres {
 struct nfs_readargs {
         struct nfs_fh *         fh;
         struct nfs_open_context *context;
+        struct nfs_lock_context *lock_context;
         __u64                   offset;
         __u32                   count;
         unsigned int            pgbase;
@@ -354,6 +355,7 @@ struct nfs_readres {
 struct nfs_writeargs {
         struct nfs_fh *         fh;
         struct nfs_open_context *context;
+        struct nfs_lock_context *lock_context;
         __u64                   offset;
         __u32                   count;
         enum nfs3_stable_how    stable;