summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeff Layton <jlayton@redhat.com>2009-09-12 17:54:29 +0200
committerSteve French <sfrench@us.ibm.com>2009-09-15 21:45:06 +0200
commit495e993745a722cfa54d76b97d18e8f30c3e6cea (patch)
tree87f7f3cee5d6dec98debc8957628548f2b774ed2
parentcifs: fix oplock request handling in posix codepath (diff)
downloadlinux-495e993745a722cfa54d76b97d18e8f30c3e6cea.tar.xz
linux-495e993745a722cfa54d76b97d18e8f30c3e6cea.zip
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>
-rw-r--r--fs/cifs/cifsglob.h1
-rw-r--r--fs/cifs/misc.c1
2 files changed, 0 insertions, 2 deletions
diff --git a/fs/cifs/cifsglob.h b/fs/cifs/cifsglob.h
index a03482298ed9..9a7527dc977e 100644
--- 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 e079a9190ec4..f2d508df7ec5 100644
--- 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"));