From patchwork Thu Dec 6 18:26:31 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pavel Shilovsky X-Patchwork-Id: 1846431 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 05D3DDF2F9 for ; Thu, 6 Dec 2012 18:27:52 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1946587Ab2LFS1X (ORCPT ); Thu, 6 Dec 2012 13:27:23 -0500 Received: from mail-lb0-f174.google.com ([209.85.217.174]:57893 "EHLO mail-lb0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1946536Ab2LFS0t (ORCPT ); Thu, 6 Dec 2012 13:26:49 -0500 Received: by mail-lb0-f174.google.com with SMTP id gi11so5586985lbb.19 for ; Thu, 06 Dec 2012 10:26:47 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references; bh=OSgBjZomjJh0FArPwAyYtWBJ2jXw68I8nUkl2V6Gt1s=; b=p0XzqgTF4lDGEXSsPBwM4XZAPff4320aLvNXWS9NSHOeKvvGB2WbpFXrJuIMzOoVjF aEAHTkAMHbHyWixkJqahCqNs3G5y0PgVnOPbQ+mwfnSq5gybGGiC7fhu4PTHh/vhKTEz CkS1BWEmYPAa9Kb6HhL48oGf35IbxiGZ058iqY40Bopa4+b8+x3r89hhsZSiiLC2zFDg X+TFaEt17kk3lJMLtTGcEhobZze4pL0fxCdry12Lw843BtVMvRTDUYQ0GVgc9hNrCgK8 XxK2Q6S2Np0LzNlHInD3XduoUl/IDMokcesJbZD/HTOxDS9loU3sSa5ynQ+aOybGJBGR zDzA== Received: by 10.112.42.197 with SMTP id q5mr1408664lbl.9.1354818407018; Thu, 06 Dec 2012 10:26:47 -0800 (PST) Received: from localhost.localdomain ([79.126.69.151]) by mx.google.com with ESMTPS id v6sm3813970lbf.11.2012.12.06.10.26.44 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 06 Dec 2012 10:26:46 -0800 (PST) From: Pavel Shilovsky To: linux-cifs@vger.kernel.org Cc: linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org, wine-devel@winehq.org, linux-nfs@vger.kernel.org Subject: [PATCH 3/3] CIFS: Use NT_CREATE_ANDX command for forcemand mounts Date: Thu, 6 Dec 2012 22:26:31 +0400 Message-Id: <1354818391-7968-4-git-send-email-piastry@etersoft.ru> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1354818391-7968-1-git-send-email-piastry@etersoft.ru> References: <1354818391-7968-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 4784d53..8edd950 100644 --- a/fs/cifs/dir.c +++ b/fs/cifs/dir.c @@ -216,6 +216,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 e2614b9..8cfda53 100644 --- a/fs/cifs/file.c +++ b/fs/cifs/file.c @@ -426,8 +426,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, @@ -595,6 +596,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))) { /*