From patchwork Thu Feb 28 15:25:30 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pavel Shilovsky X-Patchwork-Id: 2199011 Return-Path: X-Original-To: patchwork-cifs-client@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 CA457DF2A2 for ; Thu, 28 Feb 2013 15:24:10 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1760708Ab3B1PW7 (ORCPT ); Thu, 28 Feb 2013 10:22:59 -0500 Received: from mail-la0-f52.google.com ([209.85.215.52]:62780 "EHLO mail-la0-f52.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755321Ab3B1PWy (ORCPT ); Thu, 28 Feb 2013 10:22:54 -0500 Received: by mail-la0-f52.google.com with SMTP id fs12so1904038lab.11 for ; Thu, 28 Feb 2013 07:22:52 -0800 (PST) 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=VpZ9ID5aPBGxI48X7pahmWR2dApCuQ54ALcYHT5xDvc=; b=b8aKBCLuCc5b7zTtUOwAEWMeqtQ1nsMBXoezy4hZmxmBAROe7kEl50V6yI7JkrJkUo Bvb/NP7VUJqU+FS6YVlFnK+Q3OVoSfrdN5TZ7RbLkczZyJBD3fmFMDdjbc9p0qQ4gChE N1v2WsQZ2MBG2VjfBLwCR44eMfHkXNMq2CTnrNt3Lf14zsHr8RCrdtV8ofb2Q8NkYC/o GZz+8aN4xx2Iztxawx+zusawz4GzhY2w8BJAGKCKQg0ZPDNQfixB1+3iIt7wb05hb/Rv OSf9ZDZ8tyWoaRljbto3euwdhLAAEweuM+1+tnjzAylA71u0iWnfXSlzddYtrjaq2uEn ceKQ== X-Received: by 10.112.37.194 with SMTP id a2mr3793875lbk.40.1362064972193; Thu, 28 Feb 2013 07:22:52 -0800 (PST) Received: from workstation.localdomain ([79.126.96.201]) by mx.google.com with ESMTPS id f4sm3055511lbo.4.2013.02.28.07.22.50 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 28 Feb 2013 07:22:51 -0800 (PST) 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 v3 4/7] CIFS: Use NT_CREATE_ANDX command for forcemand mounts Date: Thu, 28 Feb 2013 19:25:30 +0400 Message-Id: <1362065133-9490-5-git-send-email-piastry@etersoft.ru> X-Mailer: git-send-email 1.8.1.2 In-Reply-To: <1362065133-9490-1-git-send-email-piastry@etersoft.ru> References: <1362065133-9490-1-git-send-email-piastry@etersoft.ru> Sender: linux-cifs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-cifs@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 Acked-by: Jeff Layton --- 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 6975072..139c8bc 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 3ad484c..05191da 100644 --- a/fs/cifs/file.c +++ b/fs/cifs/file.c @@ -454,8 +454,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, @@ -623,6 +624,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))) { /*