diff options
| author | Jeff Layton <jlayton@redhat.com> | 2009-09-12 11:54:29 -0400 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2009-09-15 15:45:06 -0400 |
| commit | 495e993745a722cfa54d76b97d18e8f30c3e6cea (patch) | |
| tree | 87f7f3cee5d6dec98debc8957628548f2b774ed2 | |
| parent | 590a3fe0e18473a55b0ff48548ba87a2010d7730 (diff) | |
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.h | 1 | ||||
| -rw-r--r-- | fs/cifs/misc.c | 1 |
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 { | |||
| 382 | unsigned long time; /* jiffies of last update/check of inode */ | 382 | unsigned long time; /* jiffies of last update/check of inode */ |
| 383 | bool clientCanCacheRead:1; /* read oplock */ | 383 | bool clientCanCacheRead:1; /* read oplock */ |
| 384 | bool clientCanCacheAll:1; /* read and writebehind oplock */ | 384 | bool clientCanCacheAll:1; /* read and writebehind oplock */ |
| 385 | bool oplockPending:1; | ||
| 386 | bool delete_pending:1; /* DELETE_ON_CLOSE is set */ | 385 | bool delete_pending:1; /* DELETE_ON_CLOSE is set */ |
| 387 | u64 server_eof; /* current file size on server */ | 386 | u64 server_eof; /* current file size on server */ |
| 388 | u64 uniqueid; /* server inode number */ | 387 | 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) | |||
| 576 | pCifsInode->clientCanCacheAll = false; | 576 | pCifsInode->clientCanCacheAll = false; |
| 577 | if (pSMB->OplockLevel == 0) | 577 | if (pSMB->OplockLevel == 0) |
| 578 | pCifsInode->clientCanCacheRead = false; | 578 | pCifsInode->clientCanCacheRead = false; |
| 579 | pCifsInode->oplockPending = true; | ||
| 580 | AllocOplockQEntry(netfile->pInode, | 579 | AllocOplockQEntry(netfile->pInode, |
| 581 | netfile->netfid, tcon); | 580 | netfile->netfid, tcon); |
| 582 | cFYI(1, ("about to wake up oplock thread")); | 581 | cFYI(1, ("about to wake up oplock thread")); |
