Commit 7e5b9266 authored Oct 28, 2020 by Bob Peterson Committed by Andreas Gruenbacher Oct 29, 2020

gfs2: don't initialize statfs_change inodes in spectator mode

Before commit 97fd734b, the local statfs_changeX inode was never
initialized for spectator mounts. However, it still checks for
spectator mounts when unmounting everything. There's no good reason to
lookup the statfs_changeX files because spectators cannot perform recovery.
It still, however, needs the master statfs file for statfs calls.
This patch adds the check for spectator mounts to init_statfs.

Fixes: 97fd734b ("gfs2: lookup local statfs inodes prior to journal recovery")
Signed-off-by: Bob Peterson <rpeterso@redhat.com>
Signed-off-by: Andreas Gruenbacher <agruenba@redhat.com>

parent 4a55752a

fs/gfs2/ops_fstype.c

+8 −4

Original line number	Diff line number	Diff line
		@@ -633,8 +633,10 @@ static int init_statfs(struct gfs2_sbd *sdp)
		if (IS_ERR(sdp->sd_statfs_inode)) {
		error = PTR_ERR(sdp->sd_statfs_inode);
		fs_err(sdp, "can't read in statfs inode: %d\n", error);
		goto fail;
		goto out;
		}
		if (sdp->sd_args.ar_spectator)
		goto out;

		pn = gfs2_lookup_simple(master, "per_node");
		if (IS_ERR(pn)) {
		@@ -682,15 +684,17 @@ free_local:
		iput(pn);
		put_statfs:
		iput(sdp->sd_statfs_inode);
		fail:
		out:
		return error;
		}

		/* Uninitialize and free up memory used by the list of statfs inodes */
		static void uninit_statfs(struct gfs2_sbd *sdp)
		{
		if (!sdp->sd_args.ar_spectator) {
		gfs2_glock_dq_uninit(&sdp->sd_sc_gh);
		free_local_statfs_inodes(sdp);
		}
		iput(sdp->sd_statfs_inode);
		}

Admin message