cifs: remove cifsInodeInfo.oplockPending flag

It's set on oplock break but nothing ever looks at it.

Signed-off-by: Jeff Layton <jlayton@redhat.com>
Signed-off-by: Steve French <sfrench@us.ibm.com>

diff --git a/fs/cifs/cifsglob.h b/fs/cifs/cifsglob.h
index a03482298ed96357fb9b2e30a62d568d1cbacbe8..9a7527dc977ec675de99c8bd0c947f2ff5dcb2b8 100644 (file)
--- a/fs/cifs/cifsglob.h
+++ b/fs/cifs/cifsglob.h
@@ -382,7 +382,6 @@ struct cifsInodeInfo {
        unsigned long time;     /* jiffies of last update/check of inode */
        bool clientCanCacheRead:1;      /* read oplock */
        bool clientCanCacheAll:1;       /* read and writebehind oplock */
-       bool oplockPending:1;
        bool delete_pending:1;          /* DELETE_ON_CLOSE is set */
        u64  server_eof;                /* current file size on server */
        u64  uniqueid;                  /* server inode number */

diff --git a/fs/cifs/misc.c b/fs/cifs/misc.c
index e079a9190ec4f6ffd5bbae2061f41bc5711a914d..f2d508df7ec5a0ff199b617a81ba944df111a59d 100644 (file)
--- a/fs/cifs/misc.c
+++ b/fs/cifs/misc.c
@@ -576,7 +576,6 @@ is_valid_oplock_break(struct smb_hdr *buf, struct TCP_Server_Info *srv)
                                pCifsInode->clientCanCacheAll = false;
                                if (pSMB->OplockLevel == 0)
                                        pCifsInode->clientCanCacheRead = false;
-                               pCifsInode->oplockPending = true;
                                AllocOplockQEntry(netfile->pInode,
                                                  netfile->netfid, tcon);
                                cFYI(1, ("about to wake up oplock thread"));