From patchwork Tue Apr 9 12:40:24 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pavel Shilovsky X-Patchwork-Id: 2415181 Return-Path: X-Original-To: patchwork-linux-nfs@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id DEA22DF25A for ; Tue, 9 Apr 2013 12:39:04 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S936364Ab3DIMig (ORCPT ); Tue, 9 Apr 2013 08:38:36 -0400 Received: from mail-la0-f49.google.com ([209.85.215.49]:56695 "EHLO mail-la0-f49.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S935852Ab3DIMgk (ORCPT ); Tue, 9 Apr 2013 08:36:40 -0400 Received: by mail-la0-f49.google.com with SMTP id fs12so1668884lab.8 for ; Tue, 09 Apr 2013 05:36:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:sender:from:to:cc:subject:date:message-id:x-mailer :in-reply-to:references; bh=BCMfIj8HRRen/9znts8NMqvnTZxbMFmI6YU56VvXvFI=; b=KPvjkyNnU1U5/JA1kr6zKtglk1tWkEk/PLC1T39/wWPdktef+ekMhAAUuoUXHJTrKn nvlZBGZrnyPd0BTRvDFGI8uFUfPukObV0L21s5uQ7PgQRof8WIffT4kdiU/DF2sb7TAL J0t7OYtcYNzdVbyyxfFGcGZEtQzuqh7hIGO3F/LYMfHKP4aco95X4PnqQcS2fPBbEyhk 97JLHfetuuxiuwW35n6WiXhHRW3Xj3JtPoaex9vNvIx2wPBL4bFwLShwsOCD2pW4rEeZ W6V7AXRLdQdrzDtjqVwapSNUpifjPeqhmaOBfbZ0wy8Xmr7GcEjZ2tlaU9sn3cRF6sXf DoYw== X-Received: by 10.152.104.36 with SMTP id gb4mr14057033lab.13.1365510997708; Tue, 09 Apr 2013 05:36:37 -0700 (PDT) Received: from workstation.localdomain (PPPoE-78-29-80-229.san.ru. [78.29.80.229]) by mx.google.com with ESMTPS id i3sm12413591lbn.0.2013.04.09.05.36.35 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 09 Apr 2013 05:36:36 -0700 (PDT) From: Pavel Shilovsky To: linux-kernel@vger.kernel.org Cc: linux-cifs@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-nfs@vger.kernel.org, wine-devel@winehq.org Subject: [PATCH v5 4/7] CIFS: Use NT_CREATE_ANDX command for forcemand mounts Date: Tue, 9 Apr 2013 16:40:24 +0400 Message-Id: <1365511227-17626-5-git-send-email-piastry@etersoft.ru> X-Mailer: git-send-email 1.8.1.5 In-Reply-To: <1365511227-17626-1-git-send-email-piastry@etersoft.ru> References: <1365511227-17626-1-git-send-email-piastry@etersoft.ru> Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org forcemand mount option now lets us use Windows mandatory style of byte-range locks even if server supports posix ones - switches on Windows locking mechanism. Share flags is another locking mehanism provided by Windows semantic that can be used by NT_CREATE_ANDX command. This patch combines all Windows locking mechanism in one mount option by using NT_CREATE_ANDX to open files if forcemand is on. Signed-off-by: Pavel Shilovsky --- fs/cifs/dir.c | 1 + fs/cifs/file.c | 6 ++++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/fs/cifs/dir.c b/fs/cifs/dir.c index d4331de..8587021 100644 --- a/fs/cifs/dir.c +++ b/fs/cifs/dir.c @@ -217,6 +217,7 @@ cifs_do_create(struct inode *inode, struct dentry *direntry, unsigned int xid, } if (tcon->unix_ext && cap_unix(tcon->ses) && !tcon->broken_posix_open && + ((cifs_sb->mnt_cifs_flags & CIFS_MOUNT_NOPOSIXBRL) == 0) && (CIFS_UNIX_POSIX_PATH_OPS_CAP & le64_to_cpu(tcon->fsUnixInfo.Capability))) { rc = cifs_posix_open(full_path, &newinode, inode->i_sb, mode, diff --git a/fs/cifs/file.c b/fs/cifs/file.c index 9394b2b..19038a4 100644 --- a/fs/cifs/file.c +++ b/fs/cifs/file.c @@ -455,8 +455,9 @@ int cifs_open(struct inode *inode, struct file *file) else oplock = 0; - if (!tcon->broken_posix_open && tcon->unix_ext && - cap_unix(tcon->ses) && (CIFS_UNIX_POSIX_PATH_OPS_CAP & + if (!tcon->broken_posix_open && tcon->unix_ext && cap_unix(tcon->ses) + && ((cifs_sb->mnt_cifs_flags & CIFS_MOUNT_NOPOSIXBRL) == 0) && + (CIFS_UNIX_POSIX_PATH_OPS_CAP & le64_to_cpu(tcon->fsUnixInfo.Capability))) { /* can not refresh inode info since size could be stale */ rc = cifs_posix_open(full_path, &inode, inode->i_sb, @@ -624,6 +625,7 @@ cifs_reopen_file(struct cifsFileInfo *cfile, bool can_flush) oplock = 0; if (tcon->unix_ext && cap_unix(tcon->ses) && + ((cifs_sb->mnt_cifs_flags & CIFS_MOUNT_NOPOSIXBRL) == 0) && (CIFS_UNIX_POSIX_PATH_OPS_CAP & le64_to_cpu(tcon->fsUnixInfo.Capability))) { /*