diff options
| author | Pavel Emelyanov <xemul@openvz.org> | 2007-10-01 17:41:14 -0400 |
|---|---|---|
| committer | J. Bruce Fields <bfields@citi.umich.edu> | 2007-10-09 18:32:46 -0400 |
| commit | fc5846e555177c2ae01bcded7fddf60cb10dcfd0 (patch) | |
| tree | 3aba3ddd444086db1a3bd50cbfaf89cd2aff269c | |
| parent | 66abe5f257e719547744fdb8691cf5d20603f051 (diff) | |
AFS: 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: David Howells <dhowells@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
| -rw-r--r-- | fs/afs/flock.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/fs/afs/flock.c b/fs/afs/flock.c index af6952e39a18..210acafe4a9b 100644 --- a/fs/afs/flock.c +++ b/fs/afs/flock.c | |||
| @@ -524,8 +524,7 @@ int afs_lock(struct file *file, int cmd, struct file_lock *fl) | |||
| 524 | (long long) fl->fl_start, (long long) fl->fl_end); | 524 | (long long) fl->fl_start, (long long) fl->fl_end); |
| 525 | 525 | ||
| 526 | /* AFS doesn't support mandatory locks */ | 526 | /* AFS doesn't support mandatory locks */ |
| 527 | if ((vnode->vfs_inode.i_mode & (S_ISGID | S_IXGRP)) == S_ISGID && | 527 | if (__mandatory_lock(&vnode->vfs_inode) && fl->fl_type != F_UNLCK) |
| 528 | fl->fl_type != F_UNLCK) | ||
| 529 | return -ENOLCK; | 528 | return -ENOLCK; |
| 530 | 529 | ||
| 531 | if (IS_GETLK(cmd)) | 530 | if (IS_GETLK(cmd)) |