aboutsummaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
Diffstat (limited to 'fs')
-rw-r--r--fs/gfs2/glock.c5
1 files changed, 0 insertions, 5 deletions
diff --git a/fs/gfs2/glock.c b/fs/gfs2/glock.c
index eed4b6855614..ee2178d661f5 100644
--- a/fs/gfs2/glock.c
+++ b/fs/gfs2/glock.c
@@ -543,11 +543,6 @@ __acquires(&gl->gl_spin)
543 clear_bit(GLF_INVALIDATE_IN_PROGRESS, &gl->gl_flags); 543 clear_bit(GLF_INVALIDATE_IN_PROGRESS, &gl->gl_flags);
544 544
545 gfs2_glock_hold(gl); 545 gfs2_glock_hold(gl);
546 if (target != LM_ST_UNLOCKED && (gl->gl_state == LM_ST_SHARED ||
547 gl->gl_state == LM_ST_DEFERRED) &&
548 !(lck_flags & (LM_FLAG_TRY | LM_FLAG_TRY_1CB)))
549 lck_flags |= LM_FLAG_TRY_1CB;
550
551 if (sdp->sd_lockstruct.ls_ops->lm_lock) { 546 if (sdp->sd_lockstruct.ls_ops->lm_lock) {
552 /* lock_dlm */ 547 /* lock_dlm */
553 ret = sdp->sd_lockstruct.ls_ops->lm_lock(gl, target, lck_flags); 548 ret = sdp->sd_lockstruct.ls_ops->lm_lock(gl, target, lck_flags);