[Devel] Re: [PATCH 5/5][NFS] Cleanup explicit check for mandatory locks

[Trond Myklebust]

On Mon, 2007-09-17 at 11:57 +0400, Pavel Emelyanov wrote:
> The __mandatory_lock(inode) macro makes the same check, but
> makes the code more readable.

Could we please avoid using underscores in macros. Also, why are we
breaking the usual convention of capitalising macro names?

Cheers
  Trond

> Signed-off-by: Pavel Emelyanov <xemul at openvz.org>
> Cc: Trond Myklebust <trond.myklebust at fys.uio.no>
> 
> ---
> 
>  fs/nfs/file.c |    3 +--
>  1 files changed, 1 insertion(+), 2 deletions(-)
> 
> diff --git a/fs/nfs/file.c b/fs/nfs/file.c
> index 73ddd2e..7a07be1 100644
> --- a/fs/nfs/file.c
> +++ b/fs/nfs/file.c
> @@ -605,8 +605,7 @@ static int nfs_lock(struct file *filp, i
>  	nfs_inc_stats(inode, NFSIOS_VFSLOCK);
>  
>  	/* No mandatory locks over NFS */
> -	if ((inode->i_mode & (S_ISGID | S_IXGRP)) == S_ISGID &&
> -	    fl->fl_type != F_UNLCK)
> +	if (__mandatory_lock(inode) && fl->fl_type != F_UNLCK)
>  		return -ENOLCK;
>  
>  	if (IS_GETLK(cmd))
>