Commit c1c53c26 authored by Wolfram Sang's avatar Wolfram Sang Committed by Andreas Gruenbacher
Browse files

gfs2: make timeout values more explicit 



'timeout' is a vague name for the return value of wait_event_*_timeout
because it actually returns the time left. Because the variable is never
used later, just drop the return value. Since variable 'timeout' is then
only used to carry a fixed timeout value, drop this in favor of a fixed
function argument as in the other call to wait_event_timeout() above.

Signed-off-by: default avatarWolfram Sang <wsa+renesas@sang-engineering.com>
Signed-off-by: default avatarAndreas Gruenbacher <agruenba@redhat.com>
parent 50fabd42

fs/gfs2/super.c

+2 −3
Original line number Diff line number Diff line
@@ -1262,7 +1262,6 @@ static bool gfs2_upgrade_iopen_glock(struct inode *inode) 
	struct gfs2_inode *ip = GFS2_I(inode);

	struct gfs2_sbd *sdp = GFS2_SB(inode);

	struct gfs2_holder *gh = &ip->i_iopen_gh;

	long timeout = 5 * HZ;

	int error;



	gh->gh_flags |= GL_NOCACHE;
@@ -1293,10 +1292,10 @@ static bool gfs2_upgrade_iopen_glock(struct inode *inode) 
	if (error)

		return false;



	timeout = wait_event_interruptible_timeout(sdp->sd_async_glock_wait,

	wait_event_interruptible_timeout(sdp->sd_async_glock_wait,

		!test_bit(HIF_WAIT, &gh->gh_iflags) ||

		test_bit(GLF_DEMOTE, &ip->i_gl->gl_flags),

		timeout);

		5 * HZ);

	if (!test_bit(HIF_HOLDER, &gh->gh_iflags)) {

		gfs2_glock_dq(gh);

		return false;