From patchwork Fri Apr 5 16:57:52 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pavel Shilovsky X-Patchwork-Id: 2399391 Return-Path: X-Original-To: patchwork-linux-nfs@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 B905E3FD40 for ; Fri, 5 Apr 2013 16:55:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1422634Ab3DEQyQ (ORCPT ); Fri, 5 Apr 2013 12:54:16 -0400 Received: from mail-la0-f48.google.com ([209.85.215.48]:33487 "EHLO mail-la0-f48.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1162178Ab3DEQyN (ORCPT ); Fri, 5 Apr 2013 12:54:13 -0400 Received: by mail-la0-f48.google.com with SMTP id fq13so3638621lab.21 for ; Fri, 05 Apr 2013 09:54:10 -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=gIaEonJJWYc5NjfYhfZxniAVzO4eMXa8WcFZZvEfNWV/CZbGP8qgaF5oA+xf3WTdru GOQTDHIHdIzB8G+f7ByuMbTMJ77+9NBTpn1orSpqRbhczrLrGk0OUiQT/dfONdYvwZxL 7A2sL+WW3XUnanvYud+Vl6GVG9da5PqQPz8PkFdE/z0hTLtoMHMDB9AhrDZ9ES6aRmHB j4aVegRFfK4fU6nR7QM8VPDz9IxBURfi/HqAEjPjQiXZ/NhwaPPMKGyGSyGrjPIhbc98 rtwu54zTCfvsng7J/T4LWoE10hmXSIaW6R4eMm3ExoRwesUipw9bB4yIxZq3DP4ci6ao Us1w== X-Received: by 10.112.82.164 with SMTP id j4mr6564606lby.112.1365180850179; Fri, 05 Apr 2013 09:54:10 -0700 (PDT) Received: from workstation.localdomain ([79.126.74.178]) by mx.google.com with ESMTPS id i3sm5744658lbn.0.2013.04.05.09.54.08 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 05 Apr 2013 09:54:09 -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 v4 4/7] CIFS: Use NT_CREATE_ANDX command for forcemand mounts Date: Fri, 5 Apr 2013 20:57:52 +0400 Message-Id: <1365181075-22540-5-git-send-email-piastry@etersoft.ru> X-Mailer: git-send-email 1.8.1.5 In-Reply-To: <1365181075-22540-1-git-send-email-piastry@etersoft.ru> References: <1365181075-22540-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))) { /*