git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag '6.6-rc-smb3-client-fixes-part2' of git://git.samba.org/sfrench/cifs-2.6
[sfrench/cifs-2.6.git]
/
fs
/
gfs2
/
lock_dlm.c
diff --git
a/fs/gfs2/lock_dlm.c
b/fs/gfs2/lock_dlm.c
index 54911294687c9a948c23f73462406091f1a0d010..59ab18c798890f9c8af9fdd98938354e7473ee47 100644
(file)
--- a/
fs/gfs2/lock_dlm.c
+++ b/
fs/gfs2/lock_dlm.c
@@
-222,11
+222,6
@@
static u32 make_flags(struct gfs2_glock *gl, const unsigned int gfs_flags,
lkf |= DLM_LKF_NOQUEUEBAST;
}
- if (gfs_flags & LM_FLAG_PRIORITY) {
- lkf |= DLM_LKF_NOORDER;
- lkf |= DLM_LKF_HEADQUE;
- }
-
if (gfs_flags & LM_FLAG_ANY) {
if (req == DLM_LOCK_PR)
lkf |= DLM_LKF_ALTCW;