Re: [PATCH v3 4/7] CIFS: Use NT_CREATE_ANDX command for forcemand mounts

[Jeff Layton <jlayton@redhat.com>]

On Thu, 28 Feb 2013 19:25:30 +0400
Pavel Shilovsky <piastry@etersoft.ru> wrote:

> 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 <piastry@etersoft.ru>
> ---
>  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))) {
>  		/*

Sounds reasonable...

Acked-by: Jeff Layton <jlayton@redhat.com>