Merge branch 'sh-latest' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal...

[karo-tx-linux.git] / fs / nfsd / state.h

diff --git a/fs/nfsd/state.h b/fs/nfsd/state.h
index 2d31224b07bfa1fb43ea9eff05c31938bc6ebe7d..6bd2f3c21f2b7195b355be089084bc8222176a45 100644 (file)
--- a/fs/nfsd/state.h
+++ b/fs/nfsd/state.h
@@ -367,16 +367,12 @@ 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;