---

yaml --- r: 166360 b: refs/heads/master c: 495e993 h: refs/heads/master v: v3
git-mirror · Sep 15, 2009 · 15f5e22 · 15f5e22
1 parent 4e75265
commit 15f5e22
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 590a3fe0e18473a55b0ff48548ba87a2010d7730
+refs/heads/master: 495e993745a722cfa54d76b97d18e8f30c3e6cea
diff --git a/trunk/fs/cifs/cifsglob.h b/trunk/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/trunk/fs/cifs/misc.c b/trunk/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"));