Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d205df99 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-fixes 

* git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-fixes:
  GFS2: Processes waiting on inode glock that no processes are holding
parents 24210071 f90e5b5b

fs/gfs2/glock.c

+7 −2
Original line number Original line Diff line number Diff line
@@ -663,14 +663,19 @@ static void glock_work_func(struct work_struct *work) 
		drop_ref = 1;

		drop_ref = 1;

	}

	}

	spin_lock(&gl->gl_spin);

	spin_lock(&gl->gl_spin);

	if (test_and_clear_bit(GLF_PENDING_DEMOTE, &gl->gl_flags) &&

	if (test_bit(GLF_PENDING_DEMOTE, &gl->gl_flags) &&

	    gl->gl_state != LM_ST_UNLOCKED &&

	    gl->gl_state != LM_ST_UNLOCKED &&

	    gl->gl_demote_state != LM_ST_EXCLUSIVE) {

	    gl->gl_demote_state != LM_ST_EXCLUSIVE) {

		unsigned long holdtime, now = jiffies;

		unsigned long holdtime, now = jiffies;



		holdtime = gl->gl_tchange + gl->gl_ops->go_min_hold_time;

		holdtime = gl->gl_tchange + gl->gl_ops->go_min_hold_time;

		if (time_before(now, holdtime))

		if (time_before(now, holdtime))

			delay = holdtime - now;

			delay = holdtime - now;

		set_bit(delay ? GLF_PENDING_DEMOTE : GLF_DEMOTE, &gl->gl_flags);



		if (!delay) {

			clear_bit(GLF_PENDING_DEMOTE, &gl->gl_flags);

			set_bit(GLF_DEMOTE, &gl->gl_flags);

		}

	}

	}

	run_queue(gl, 0);

	run_queue(gl, 0);

	spin_unlock(&gl->gl_spin);

	spin_unlock(&gl->gl_spin);