lkml.org 
[lkml]   [2007]   [Sep]   [18]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: [PATCH 5/5][NFS] Cleanup explicit check for mandatory locks
Trond Myklebust wrote:
> 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?

Sorry, I've forgot to change all the log - this is not a macro,
but a static inline function. The underscores are here, because
the mandatory_lock() one already exists and additionally checks
for "if (IS_MANDLOCK(inode))"
Thanks,
Pavel

> Cheers
> Trond
>
>> Signed-off-by: Pavel Emelyanov <xemul@openvz.org>
>> Cc: Trond Myklebust <trond.myklebust@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))
>>
>
>

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/

\
 
 \ /
  Last update: 2007-09-18 08:25    [from the cache]
©2003-2011 Jasper Spaans. Advertise on this site