diff options
| author | Pavel Emelyanov <xemul@openvz.org> | 2007-10-01 17:41:13 -0400 |
|---|---|---|
| committer | J. Bruce Fields <bfields@citi.umich.edu> | 2007-10-09 18:32:46 -0400 |
| commit | 66abe5f257e719547744fdb8691cf5d20603f051 (patch) | |
| tree | eed9d626fbaafc37ebbc465c742f4e751b8838cd /fs/9p | |
| parent | 7afaac6202782ec28f2039503bdaef666834d60c (diff) | |
9PFS: 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: Eric Van Hensbergen <ericvh@gmail.com>
Cc: Ron Minnich <rminnich@sandia.gov>
Cc: Latchesar Ionkov <lucho@ionkov.net>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Diffstat (limited to 'fs/9p')
| -rw-r--r-- | fs/9p/vfs_file.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/9p/vfs_file.c b/fs/9p/vfs_file.c index 2a40c2946d0a..716691689fd5 100644 --- a/fs/9p/vfs_file.c +++ b/fs/9p/vfs_file.c | |||
| @@ -105,7 +105,7 @@ static int v9fs_file_lock(struct file *filp, int cmd, struct file_lock *fl) | |||
| 105 | P9_DPRINTK(P9_DEBUG_VFS, "filp: %p lock: %p\n", filp, fl); | 105 | P9_DPRINTK(P9_DEBUG_VFS, "filp: %p lock: %p\n", filp, fl); |
| 106 | 106 | ||
| 107 | /* No mandatory locks */ | 107 | /* No mandatory locks */ |
| 108 | if ((inode->i_mode & (S_ISGID | S_IXGRP)) == S_ISGID) | 108 | if (__mandatory_lock(inode)) |
| 109 | return -ENOLCK; | 109 | return -ENOLCK; |
| 110 | 110 | ||
| 111 | if ((IS_SETLK(cmd) || IS_SETLKW(cmd)) && fl->fl_type != F_UNLCK) { | 111 | if ((IS_SETLK(cmd) || IS_SETLKW(cmd)) && fl->fl_type != F_UNLCK) { |