From patchwork Tue Apr 9 12:40:23 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pavel Shilovsky X-Patchwork-Id: 2415151 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 4B2D93FC71 for ; Tue, 9 Apr 2013 12:38:37 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S936944Ab3DIMgk (ORCPT ); Tue, 9 Apr 2013 08:36:40 -0400 Received: from mail-la0-f52.google.com ([209.85.215.52]:50519 "EHLO mail-la0-f52.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S936935Ab3DIMgi (ORCPT ); Tue, 9 Apr 2013 08:36:38 -0400 Received: by mail-la0-f52.google.com with SMTP id ej20so2140761lab.39 for ; Tue, 09 Apr 2013 05:36:35 -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=gcjiH4UI/Uwsx5v1X8/qb1J8m3yDrC4SGBpoMHcmPXk=; b=qe6/IznxESqkQ0zPS/x3/XyMZgCKtBFUP2AC+xbSZnMxOjvkVwLafK2YEczg1aK9ZI 6O4i9261dGe8o+gDuhTwgf2gU7mA/2B1bfq3HIg0k9TCiyXXhOCUW7jh6viBVzkvAMLo 5vpHGQQN54wJHfWVVra8TkYE0dGYbgNjkBBEnK/OW27Z9sWFL3AUpvB/3/PWSCp4aA1B SnhK9oyB7onQY01XDkr1rCTQjIcysq1Wnhv69tlRoOJv+2ekCTjGdXY31gk/IKyNHWrO BPF6GTRmzPmSstPHZsETBgGNI00yOO3wJNPB53IE9P79/hIosRRxLeF4O8OWUAlwNpr1 kgqA== X-Received: by 10.112.130.201 with SMTP id og9mr13655431lbb.65.1365510995512; Tue, 09 Apr 2013 05:36:35 -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.33 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 09 Apr 2013 05:36:34 -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 3/7] CIFS: Add O_DENY* open flags support Date: Tue, 9 Apr 2013 16:40:23 +0400 Message-Id: <1365511227-17626-4-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 Construct share_access value from O_DENY* flags and send it to the server. Signed-off-by: Pavel Shilovsky --- fs/cifs/cifsfs.c | 2 +- fs/cifs/cifsglob.h | 16 +++++++++++++++- fs/cifs/dir.c | 3 +++ fs/cifs/file.c | 4 ++++ fs/locks.c | 7 ++++++- include/linux/fs.h | 1 + 6 files changed, 30 insertions(+), 3 deletions(-) diff --git a/fs/cifs/cifsfs.c b/fs/cifs/cifsfs.c index e328339..469dffb 100644 --- a/fs/cifs/cifsfs.c +++ b/fs/cifs/cifsfs.c @@ -769,7 +769,7 @@ struct file_system_type cifs_fs_type = { .name = "cifs", .mount = cifs_do_mount, .kill_sb = cifs_kill_sb, - /* .fs_flags */ + .fs_flags = FS_DOES_SHARELOCK, }; const struct inode_operations cifs_dir_inode_ops = { .create = cifs_create, diff --git a/fs/cifs/cifsglob.h b/fs/cifs/cifsglob.h index cd4bbf3..7e876b9 100644 --- a/fs/cifs/cifsglob.h +++ b/fs/cifs/cifsglob.h @@ -465,7 +465,7 @@ struct smb_vol { CIFS_MOUNT_CIFS_BACKUPUID | CIFS_MOUNT_CIFS_BACKUPGID) #define CIFS_MS_MASK (MS_RDONLY | MS_MANDLOCK | MS_NOEXEC | MS_NOSUID | \ - MS_NODEV | MS_SYNCHRONOUS) + MS_NODEV | MS_SYNCHRONOUS | MS_SHARELOCK) struct cifs_mnt_data { struct cifs_sb_info *cifs_sb; @@ -947,6 +947,20 @@ struct cifsFileInfo { struct work_struct oplock_break; /* work for oplock breaks */ }; +static inline int +cifs_get_share_flags(unsigned int flags) +{ + int share_access = 0; + + if (!(flags & O_DENYREAD)) + share_access |= FILE_SHARE_READ; + if (!(flags & O_DENYWRITE)) + share_access |= FILE_SHARE_WRITE; + if (!(flags & O_DENYDELETE)) + share_access |= FILE_SHARE_DELETE; + return share_access; +} + struct cifs_io_parms { __u16 netfid; #ifdef CONFIG_CIFS_SMB2 diff --git a/fs/cifs/dir.c b/fs/cifs/dir.c index 267b608..d4331de 100644 --- a/fs/cifs/dir.c +++ b/fs/cifs/dir.c @@ -294,6 +294,9 @@ cifs_do_create(struct inode *inode, struct dentry *direntry, unsigned int xid, else cFYI(1, "Create flag not set in create function"); + if (IS_SHARELOCK(inode)) + share_access = cifs_get_share_flags(oflags); + /* * BB add processing to set equivalent of mode - e.g. via CreateX with * ACLs diff --git a/fs/cifs/file.c b/fs/cifs/file.c index 0d524a7..9394b2b 100644 --- a/fs/cifs/file.c +++ b/fs/cifs/file.c @@ -210,6 +210,8 @@ cifs_nt_open(char *full_path, struct inode *inode, struct cifs_sb_info *cifs_sb, *********************************************************************/ disposition = cifs_get_disposition(f_flags); + if (IS_SHARELOCK(inode)) + share_access = cifs_get_share_flags(f_flags); /* BB pass O_SYNC flag through on file attributes .. BB */ @@ -645,6 +647,8 @@ cifs_reopen_file(struct cifsFileInfo *cfile, bool can_flush) } desired_access = cifs_convert_flags(cfile->f_flags); + if (IS_SHARELOCK(inode)) + share_access = cifs_get_share_flags(cfile->f_flags); if (backup_cred(cifs_sb)) create_options |= CREATE_OPEN_BACKUP_INTENT; diff --git a/fs/locks.c b/fs/locks.c index 1eccc75..52c9ea1 100644 --- a/fs/locks.c +++ b/fs/locks.c @@ -846,8 +846,13 @@ deny_lock_file(struct file *filp) { struct file_lock *lock; int error = 0; + struct inode *inode = filp->f_path.dentry->d_inode; - if (!IS_SHARELOCK(filp->f_path.dentry->d_inode)) + if (!IS_SHARELOCK(inode)) + return error; + + /* Don't set a lock on file systems that do it internally */ + if (inode->i_sb->s_type->fs_flags & FS_DOES_SHARELOCK) return error; error = flock_make_lock(filp, &lock, deny_flags_to_cmd(filp->f_flags)); diff --git a/include/linux/fs.h b/include/linux/fs.h index 073e31a..8a4232e 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h @@ -1816,6 +1816,7 @@ struct file_system_type { #define FS_USERNS_DEV_MOUNT 16 /* A userns mount does not imply MNT_NODEV */ #define FS_REVAL_DOT 16384 /* Check the paths ".", ".." for staleness */ #define FS_RENAME_DOES_D_MOVE 32768 /* FS will handle d_move() during rename() internally. */ +#define FS_DOES_SHARELOCK 65536 /* FS does sharelocks internally */ struct dentry *(*mount) (struct file_system_type *, int, const char *, void *); void (*kill_sb) (struct super_block *);