From patchwork Wed Aug 15 11:24:23 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pavel Shilovsky X-Patchwork-Id: 1325381 Return-Path: X-Original-To: patchwork-cifs-client@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork1.kernel.org (Postfix) with ESMTP id 562BD40B1C for ; Wed, 15 Aug 2012 11:25:32 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752120Ab2HOLZ0 (ORCPT ); Wed, 15 Aug 2012 07:25:26 -0400 Received: from mail-lpp01m010-f46.google.com ([209.85.215.46]:40405 "EHLO mail-lpp01m010-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754070Ab2HOLZR (ORCPT ); Wed, 15 Aug 2012 07:25:17 -0400 Received: by mail-lpp01m010-f46.google.com with SMTP id y9so765271lag.19 for ; Wed, 15 Aug 2012 04:25:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:subject:date:message-id:x-mailer:in-reply-to :references; bh=g3d35G7CV4dVyAsB2Kw6r8XYQGk/x9UMxuAl312bggk=; b=FnnTdCSfHTnjfwZQPCaTXZA9/qteemnXbuLBqs0PRTh6IgJM0Ay1Dut+XYkIwXWC3G qS4LOdMmVK8D6cT8yex/yHHgfIvaB9vCQEg3SIlTWsxn0mJoLTQrh7L09fVxAa1Y5FNv r11/HhBKZbU1DhCR5qor4Qrx5Ec+vUXtxyK2ZGjhkIcWh+bC9TVDQPSdd/Ck6N3dyCCt iA/9qM5NF/8XsTCHzw+NaE7B78eSt2XUcFiLdKTvjkILF2GPgLAEIDwst8LgnFdQvttz MM2mjFD94XxbLYMZrY7CkX7NfPyw1FRxFlOYmbZ+FVYF97GEMvmH2rtShBHJvb0QeX2T 1msQ== Received: by 10.152.124.76 with SMTP id mg12mr15533509lab.10.1345029916916; Wed, 15 Aug 2012 04:25:16 -0700 (PDT) Received: from localhost.localdomain ([95.84.9.233]) by mx.google.com with ESMTPS id gd9sm324527lbb.15.2012.08.15.04.25.14 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 15 Aug 2012 04:25:15 -0700 (PDT) From: Pavel Shilovsky To: linux-cifs@vger.kernel.org Subject: [PATCH 2/2] CIFS: Fix wrong setting of open requested oplock parm Date: Wed, 15 Aug 2012 15:24:23 +0400 Message-Id: <1345029863-6731-2-git-send-email-pshilovsky@samba.org> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1345029863-6731-1-git-send-email-pshilovsky@samba.org> References: <1345029863-6731-1-git-send-email-pshilovsky@samba.org> Sender: linux-cifs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-cifs@vger.kernel.org Use oplock argument rather than BATCH value. Signed-off-by: Pavel Shilovsky --- fs/cifs/smb2pdu.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/fs/cifs/smb2pdu.c b/fs/cifs/smb2pdu.c index 88ac69c..cee8f4d 100644 --- a/fs/cifs/smb2pdu.c +++ b/fs/cifs/smb2pdu.c @@ -896,7 +896,7 @@ SMB2_open(const unsigned int xid, struct cifs_tcon *tcon, __le16 *path, return rc; if (server->oplocks) - req->RequestedOplockLevel = SMB2_OPLOCK_LEVEL_BATCH; + req->RequestedOplockLevel = *oplock; else req->RequestedOplockLevel = SMB2_OPLOCK_LEVEL_NONE; req->ImpersonationLevel = IL_IMPERSONATION;