Merge branch 'irq-cleanup-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[firefly-linux-kernel-4.4.55.git] / fs / nfsd / state.h

diff --git a/fs/nfsd/state.h b/fs/nfsd/state.h
index 3074656ba7bf96cc23c024bc7b9ec35256b5cd80..6bd2f3c21f2b7195b355be089084bc8222176a45 100644 (file)
--- a/fs/nfsd/state.h
+++ b/fs/nfsd/state.h
@@ -83,8 +83,6 @@ struct nfs4_delegation {
        atomic_t                dl_count;       /* ref count */
        struct nfs4_client      *dl_client;
        struct nfs4_file        *dl_file;
-       struct file             *dl_vfs_file;
-       struct file_lock        *dl_flock;
        u32                     dl_type;
        time_t                  dl_time;
 /* For recall: */
@@ -369,16 +367,15 @@ struct nfs4_file {
        struct list_head        fi_delegations;
        /* One each for O_RDONLY, O_WRONLY, O_RDWR: */
        struct file *           fi_fds[3];
-       /* One each for O_RDONLY, O_WRONLY: */
-       atomic_t                fi_access[2];
        /*
-        * Each open stateid contributes 1 to either fi_readers or
-        * fi_writers, or both, depending on the open mode.  A
-        * delegation also takes an fi_readers reference.  Lock
-        * stateid's take none.
+        * Each open or lock stateid contributes 1 to either
+        * fi_access[O_RDONLY], fi_access[O_WRONLY], or both, depending
+        * on open or lock mode:
         */
-       atomic_t                fi_readers;
-       atomic_t                fi_writers;
+       atomic_t                fi_access[2];
+       struct file             *fi_deleg_file;
+       struct file_lock        *fi_lease;
+       atomic_t                fi_delegees;
        struct inode            *fi_inode;
        u32                     fi_id;      /* used with stateowner->so_id 
                                             * for stateid_hashtbl hash */