From patchwork Thu Jan 17 16:53:01 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pavel Shilovsky X-Patchwork-Id: 1997341 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 4BDA3DF2E1 for ; Thu, 17 Jan 2013 17:02:04 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755388Ab3AQRBg (ORCPT ); Thu, 17 Jan 2013 12:01:36 -0500 Received: from mail-la0-f53.google.com ([209.85.215.53]:37705 "EHLO mail-la0-f53.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752708Ab3AQRBf (ORCPT ); Thu, 17 Jan 2013 12:01:35 -0500 Received: by mail-la0-f53.google.com with SMTP id fn20so2940120lab.12 for ; Thu, 17 Jan 2013 09:01:33 -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=CCHz/9IhFOLKwFMKHTsL2hx0ay8oX0LyPGFbZfU+RPU=; b=I6aTgCudGd6jq6KV7HCHtCYweBUmCCg56YOzTkA6gUbJpqYU2n7LZYwIjZa7cOlBZN 7pDqvwgPUVxXF/cgIUwHTh2lZdMQTltE26dTj1dYbCsLhMNCFZM2OAFvrQGN4L/lztML LOUrBHvxnXOthoRjdsifNW5Pb0ejeQ/59dLkv2Fz0EA+Gxiy/UNSyJ3Sk/mmWzipXaQy O/Wf/Z/ZXKJ5KfiX2dpQQAWEKf+SVWAQCmBdlJCXn8yjon4yoe5n1Iqw+Qoh0CzgvrXi ffia4gewtMM1+6C8VR5IqR2MwSMZ82KV9ioCBbAk2AEBbaQVqz3HSv47JgX1nM2qh+GK kSyw== X-Received: by 10.152.104.226 with SMTP id gh2mr5577945lab.24.1358441603253; Thu, 17 Jan 2013 08:53:23 -0800 (PST) Received: from builder.office.etersoft.ru (pritvor.etersoft.ru. [91.232.225.2]) by mx.google.com with ESMTPS id z4sm1067635lbn.17.2013.01.17.08.53.20 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 17 Jan 2013 08:53:22 -0800 (PST) From: Pavel Shilovsky To: linux-kernel@vger.kernel.org Cc: linux-fsdevel@vger.kernel.org, linux-cifs@vger.kernel.org, linux-nfs@vger.kernel.org, wine-devel@winehq.org Subject: [PATCH v2 5/8] CIFS: Use NT_CREATE_ANDX command for forcemand mounts Date: Thu, 17 Jan 2013 20:53:01 +0400 Message-Id: <1358441584-8783-5-git-send-email-piastry@etersoft.ru> X-Mailer: git-send-email 1.8.1.1 In-Reply-To: <1358441584-8783-1-git-send-email-piastry@etersoft.ru> References: <1358441584-8783-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 12ee773..06be419 100644 --- a/fs/cifs/dir.c +++ b/fs/cifs/dir.c @@ -185,6 +185,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 4ddf450..bb10486 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, @@ -575,6 +576,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))) { /*