Patchwork [1/4] cifs: remove cifsInodeInfo.oplockPending flag

login
register
mail settings
Submitter Jeff Layton
Date Sept. 8, 2009, 2:12 p.m.
Message ID <1252419179-31353-2-git-send-email-jlayton@redhat.com>
Download mbox | patch
Permalink /patch/33131/
State New
Headers show

Comments

Jeff Layton - Sept. 8, 2009, 2:12 p.m.
It's set on oplock break but nothing ever looks at it.

Signed-off-by: Jeff Layton <jlayton@redhat.com>
---
 fs/cifs/cifsglob.h |    1 -
 fs/cifs/misc.c     |    1 -
 2 files changed, 0 insertions(+), 2 deletions(-)

Patch

diff --git a/fs/cifs/cifsglob.h b/fs/cifs/cifsglob.h
index 6cfc81a..b8d673c 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 e079a91..f2d508d 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"));