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

Commit 04aea0ca authored by Bob Peterson's avatar Bob Peterson Committed by Andreas Gruenbacher
Browse files

gfs2: Rename SDF_SHUTDOWN to SDF_WITHDRAWN 



Before this patch, the superblock flag indicating when a file system
is withdrawn was called SDF_SHUTDOWN. This patch simply renames it to
the more obvious SDF_WITHDRAWN.

Signed-off-by: default avatarBob Peterson <rpeterso@redhat.com>
Signed-off-by: default avatarAndreas Gruenbacher <agruenba@redhat.com>
parent d14e1ca3

fs/gfs2/aops.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -518,7 +518,7 @@ static int __gfs2_readpage(void *file, struct page *page) 
		error = mpage_readpage(page, gfs2_block_map);

		error = mpage_readpage(page, gfs2_block_map);

	}

	}





	if (unlikely(test_bit(SDF_SHUTDOWN, &sdp->sd_flags)))

	if (unlikely(test_bit(SDF_WITHDRAWN, &sdp->sd_flags)))

		return -EIO;

		return -EIO;





	return error;

	return error;
@@ -635,7 +635,7 @@ static int gfs2_readpages(struct file *file, struct address_space *mapping, 
	gfs2_glock_dq(&gh);

	gfs2_glock_dq(&gh);

out_uninit:

out_uninit:

	gfs2_holder_uninit(&gh);

	gfs2_holder_uninit(&gh);

	if (unlikely(test_bit(SDF_SHUTDOWN, &sdp->sd_flags)))

	if (unlikely(test_bit(SDF_WITHDRAWN, &sdp->sd_flags)))

		ret = -EIO;

		ret = -EIO;

	return ret;

	return ret;

}

}

fs/gfs2/file.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -1166,7 +1166,7 @@ static int gfs2_lock(struct file *file, int cmd, struct file_lock *fl) 
		cmd = F_SETLK;

		cmd = F_SETLK;

		fl->fl_type = F_UNLCK;

		fl->fl_type = F_UNLCK;

	}

	}

	if (unlikely(test_bit(SDF_SHUTDOWN, &sdp->sd_flags))) {

	if (unlikely(test_bit(SDF_WITHDRAWN, &sdp->sd_flags))) {

		if (fl->fl_type == F_UNLCK)

		if (fl->fl_type == F_UNLCK)

			locks_lock_file_wait(file, fl);

			locks_lock_file_wait(file, fl);

		return -EIO;

		return -EIO;

fs/gfs2/glock.c

+3 −3
Original line number Original line Diff line number Diff line
@@ -544,7 +544,7 @@ __acquires(&gl->gl_lockref.lock) 
	unsigned int lck_flags = (unsigned int)(gh ? gh->gh_flags : 0);

	unsigned int lck_flags = (unsigned int)(gh ? gh->gh_flags : 0);

	int ret;

	int ret;





	if (unlikely(test_bit(SDF_SHUTDOWN, &sdp->sd_flags)) &&

	if (unlikely(test_bit(SDF_WITHDRAWN, &sdp->sd_flags)) &&

	    target != LM_ST_UNLOCKED)

	    target != LM_ST_UNLOCKED)

		return;

		return;

	lck_flags &= (LM_FLAG_TRY | LM_FLAG_TRY_1CB | LM_FLAG_NOEXP |

	lck_flags &= (LM_FLAG_TRY | LM_FLAG_TRY_1CB | LM_FLAG_NOEXP |
@@ -581,7 +581,7 @@ __acquires(&gl->gl_lockref.lock) 
		}

		}

		else if (ret) {

		else if (ret) {

			fs_err(sdp, "lm_lock ret %d\n", ret);

			fs_err(sdp, "lm_lock ret %d\n", ret);

			GLOCK_BUG_ON(gl, !test_bit(SDF_SHUTDOWN,

			GLOCK_BUG_ON(gl, !test_bit(SDF_WITHDRAWN,

						   &sdp->sd_flags));

						   &sdp->sd_flags));

		}

		}

	} else { /* lock_nolock */

	} else { /* lock_nolock */
@@ -1094,7 +1094,7 @@ int gfs2_glock_nq(struct gfs2_holder *gh) 
	struct gfs2_sbd *sdp = gl->gl_name.ln_sbd;

	struct gfs2_sbd *sdp = gl->gl_name.ln_sbd;

	int error = 0;

	int error = 0;





	if (unlikely(test_bit(SDF_SHUTDOWN, &sdp->sd_flags)))

	if (unlikely(test_bit(SDF_WITHDRAWN, &sdp->sd_flags)))

		return -EIO;

		return -EIO;





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

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

fs/gfs2/glops.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -536,7 +536,7 @@ static int freeze_go_xmote_bh(struct gfs2_glock *gl, struct gfs2_holder *gh) 
			gfs2_consist(sdp);

			gfs2_consist(sdp);





		/*  Initialize some head of the log stuff  */

		/*  Initialize some head of the log stuff  */

		if (!test_bit(SDF_SHUTDOWN, &sdp->sd_flags)) {

		if (!test_bit(SDF_WITHDRAWN, &sdp->sd_flags)) {

			sdp->sd_log_sequence = head.lh_sequence + 1;

			sdp->sd_log_sequence = head.lh_sequence + 1;

			gfs2_log_pointers_init(sdp, head.lh_blkno);

			gfs2_log_pointers_init(sdp, head.lh_blkno);

		}

		}

fs/gfs2/incore.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -608,7 +608,7 @@ struct gfs2_tune { 
enum {

enum {

	SDF_JOURNAL_CHECKED	= 0,

	SDF_JOURNAL_CHECKED	= 0,

	SDF_JOURNAL_LIVE	= 1,

	SDF_JOURNAL_LIVE	= 1,

	SDF_SHUTDOWN		= 2,

	SDF_WITHDRAWN		= 2,

	SDF_NOBARRIERS		= 3,

	SDF_NOBARRIERS		= 3,

	SDF_NORECOVERY		= 4,

	SDF_NORECOVERY		= 4,

	SDF_DEMOTE		= 5,

	SDF_DEMOTE		= 5,