projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-2.6.39' of git://linux-nfs.org/~bfields/linux
[firefly-linux-kernel-4.4.55.git]
/
fs
/
locks.c
diff --git
a/fs/locks.c
b/fs/locks.c
index 822c3d1843af732934c9a393ffe8a51a0f7ff73f..0a4f50dfadfbf672ff3bc0bcba0581a3e94b83bb 100644
(file)
--- a/
fs/locks.c
+++ b/
fs/locks.c
@@
-414,17
+414,7
@@
static int flock64_to_posix_lock(struct file *filp, struct file_lock *fl,
fl->fl_ops = NULL;
fl->fl_lmops = NULL;
- switch (l->l_type) {
- case F_RDLCK:
- case F_WRLCK:
- case F_UNLCK:
- fl->fl_type = l->l_type;
- break;
- default:
- return -EINVAL;
- }
-
- return (0);
+ return assign_type(fl, l->l_type);
}
#endif