Skip to content

Commit

Permalink
cifs: fix cifs stable patch cifs-fix-oplock-break-handling-try-2.patch
Browse files Browse the repository at this point in the history
BugLink: http://bugs.launchpad.net/bugs/902317

The stable release 2.6.32.32 added the upstream commit
12fed00. However, one of the hunks of
the original patch seems missing from the stable backport which can be
found here:
   http://permalink.gmane.org/gmane.linux.kernel.stable/5676

This hunk corresponds to the change in is_valid_oplock_break() at
fs/cifs/misc.c.

This patch backports the missing hunk and is against
linux-2.6.32.y stable kernel.

Cc: Steve French <sfrench@us.ibm.com>
Signed-off-by: Pavel Shilovsky <piastry@etersoft.ru>
Signed-off-by: Suresh Jayaraman <sjayaraman@suse.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
  • Loading branch information
Suresh Jayaraman authored and Herton Ronaldo Krzesinski committed Jan 2, 2012
1 parent c3b27c4 commit da0e77f
Showing 1 changed file with 3 additions and 0 deletions.
3 changes: 3 additions & 0 deletions fs/cifs/misc.c
Original file line number Diff line number Diff line change
Expand Up @@ -584,6 +584,9 @@ is_valid_oplock_break(struct smb_hdr *buf, struct TCP_Server_Info *srv)
pCifsInode->clientCanCacheAll = false;
if (pSMB->OplockLevel == 0)
pCifsInode->clientCanCacheRead = false;
else if (pSMB->OplockLevel)
pCifsInode->clientCanCacheRead = true;

rc = slow_work_enqueue(&netfile->oplock_break);
if (rc) {
cERROR(1, ("failed to enqueue oplock "
Expand Down

0 comments on commit da0e77f

Please sign in to comment.