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

Commit 333c066b 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: Fix mount hang caused by certain access pattern to sysfs files
parents 75623437 19237039

fs/gfs2/ops_fstype.c

+2 −2
Original line number Diff line number Diff line
@@ -1018,13 +1018,13 @@ static int gfs2_lm_mount(struct gfs2_sbd *sdp, int silent) 
		fsname++;

	if (lm->lm_mount == NULL) {

		fs_info(sdp, "Now mounting FS...\n");

		complete(&sdp->sd_locking_init);

		complete_all(&sdp->sd_locking_init);

		return 0;

	}

	ret = lm->lm_mount(sdp, fsname);

	if (ret == 0)

		fs_info(sdp, "Joined cluster. Now mounting FS...\n");

	complete(&sdp->sd_locking_init);

	complete_all(&sdp->sd_locking_init);

	return ret;

}