diff options
| author | Pavel Emelyanov <xemul@openvz.org> | 2007-10-01 17:41:15 -0400 |
|---|---|---|
| committer | J. Bruce Fields <bfields@citi.umich.edu> | 2007-10-09 18:32:46 -0400 |
| commit | dfad9441be82f1eadc3fa3f1bbc93f93d48d1bdf (patch) | |
| tree | 059c9e1d075de6a800af3c95bbc837a2e0239819 /fs | |
| parent | fc5846e555177c2ae01bcded7fddf60cb10dcfd0 (diff) | |
NFS: clean up explicit check for mandatory locks
The __mandatory_lock(inode) macro makes the same check, but makes the code
more readable.
Signed-off-by: Pavel Emelyanov <xemul@openvz.org>
Cc: Trond Myklebust <trond.myklebust@fys.uio.no>
Cc: "J. Bruce Fields" <bfields@fieldses.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/nfs/file.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/fs/nfs/file.c b/fs/nfs/file.c index 579cf8a7d4a7..9c98ccbf9de0 100644 --- a/fs/nfs/file.c +++ b/fs/nfs/file.c | |||
| @@ -522,8 +522,7 @@ static int nfs_lock(struct file *filp, int cmd, struct file_lock *fl) | |||
| 522 | nfs_inc_stats(inode, NFSIOS_VFSLOCK); | 522 | nfs_inc_stats(inode, NFSIOS_VFSLOCK); |
| 523 | 523 | ||
| 524 | /* No mandatory locks over NFS */ | 524 | /* No mandatory locks over NFS */ |
| 525 | if ((inode->i_mode & (S_ISGID | S_IXGRP)) == S_ISGID && | 525 | if (__mandatory_lock(inode) && fl->fl_type != F_UNLCK) |
| 526 | fl->fl_type != F_UNLCK) | ||
| 527 | return -ENOLCK; | 526 | return -ENOLCK; |
| 528 | 527 | ||
| 529 | if (IS_GETLK(cmd)) | 528 | if (IS_GETLK(cmd)) |