From 15f5e22a3ac5770854eefc16d3afce70c1aec669 Mon Sep 17 00:00:00 2001
From: Jeff Layton <jlayton@redhat.com>
Date: Sat, 12 Sep 2009 11:54:29 -0400
Subject: [PATCH] --- yaml --- r: 166360 b: refs/heads/master c:
 495e993745a722cfa54d76b97d18e8f30c3e6cea h: refs/heads/master v: v3

---
 [refs]                   | 2 +-
 trunk/fs/cifs/cifsglob.h | 1 -
 trunk/fs/cifs/misc.c     | 1 -
 3 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 3e25c8a550b1..1726c84d0da1 100644
--- 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
index a03482298ed9..9a7527dc977e 100644
--- 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
index e079a9190ec4..f2d508df7ec5 100644
--- 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"));