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

Commit a5b1d3fc authored by Andreas Gruenbacher's avatar Andreas Gruenbacher
Browse files

gfs2: Rename sd_log_le_{revoke,ordered} 



Rename sd_log_le_revoke to sd_log_revokes and sd_log_le_ordered to
sd_log_ordered: not sure what le stands for here, but it doesn't add
clarity, and if it stands for list entry, it's actually confusing as
those are both list heads but not list entries.

Signed-off-by: default avatarAndreas Gruenbacher <agruenba@redhat.com>
parent 32ac43f6

fs/gfs2/incore.h

+2 −2
Original line number Diff line number Diff line
@@ -809,8 +809,8 @@ struct gfs2_sbd { 
	atomic_t sd_log_pinned;

	unsigned int sd_log_num_revoke;



	struct list_head sd_log_le_revoke;

	struct list_head sd_log_le_ordered;

	struct list_head sd_log_revokes;

	struct list_head sd_log_ordered;

	spinlock_t sd_ordered_lock;



	atomic_t sd_log_thresh1;

fs/gfs2/log.c

+7 −7
Original line number Diff line number Diff line
@@ -551,9 +551,9 @@ static void gfs2_ordered_write(struct gfs2_sbd *sdp) 
	LIST_HEAD(written);



	spin_lock(&sdp->sd_ordered_lock);

	list_sort(NULL, &sdp->sd_log_le_ordered, &ip_cmp);

	while (!list_empty(&sdp->sd_log_le_ordered)) {

		ip = list_entry(sdp->sd_log_le_ordered.next, struct gfs2_inode, i_ordered);

	list_sort(NULL, &sdp->sd_log_ordered, &ip_cmp);

	while (!list_empty(&sdp->sd_log_ordered)) {

		ip = list_entry(sdp->sd_log_ordered.next, struct gfs2_inode, i_ordered);

		if (ip->i_inode.i_mapping->nrpages == 0) {

			test_and_clear_bit(GIF_ORDERED, &ip->i_flags);

			list_del(&ip->i_ordered);
@@ -564,7 +564,7 @@ static void gfs2_ordered_write(struct gfs2_sbd *sdp) 
		filemap_fdatawrite(ip->i_inode.i_mapping);

		spin_lock(&sdp->sd_ordered_lock);

	}

	list_splice(&written, &sdp->sd_log_le_ordered);

	list_splice(&written, &sdp->sd_log_ordered);

	spin_unlock(&sdp->sd_ordered_lock);

}
@@ -573,8 +573,8 @@ static void gfs2_ordered_wait(struct gfs2_sbd *sdp) 
	struct gfs2_inode *ip;



	spin_lock(&sdp->sd_ordered_lock);

	while (!list_empty(&sdp->sd_log_le_ordered)) {

		ip = list_entry(sdp->sd_log_le_ordered.next, struct gfs2_inode, i_ordered);

	while (!list_empty(&sdp->sd_log_ordered)) {

		ip = list_entry(sdp->sd_log_ordered.next, struct gfs2_inode, i_ordered);

		list_del(&ip->i_ordered);

		WARN_ON(!test_and_clear_bit(GIF_ORDERED, &ip->i_flags));

		if (ip->i_inode.i_mapping->nrpages == 0)
@@ -611,7 +611,7 @@ void gfs2_add_revoke(struct gfs2_sbd *sdp, struct gfs2_bufdata *bd) 
		gfs2_glock_hold(gl);

	}

	set_bit(GLF_LFLUSH, &gl->gl_flags);

	list_add(&bd->bd_list, &sdp->sd_log_le_revoke);

	list_add(&bd->bd_list, &sdp->sd_log_revokes);

}



void gfs2_write_revokes(struct gfs2_sbd *sdp)

fs/gfs2/log.h

+1 −1
Original line number Diff line number Diff line
@@ -59,7 +59,7 @@ static inline void gfs2_ordered_add_inode(struct gfs2_inode *ip) 
	if (!test_bit(GIF_ORDERED, &ip->i_flags)) {

		spin_lock(&sdp->sd_ordered_lock);

		if (!test_and_set_bit(GIF_ORDERED, &ip->i_flags))

			list_add(&ip->i_ordered, &sdp->sd_log_le_ordered);

			list_add(&ip->i_ordered, &sdp->sd_log_ordered);

		spin_unlock(&sdp->sd_ordered_lock);

	}

}

fs/gfs2/lops.c

+2 −2
Original line number Diff line number Diff line
@@ -623,7 +623,7 @@ static void revoke_lo_before_commit(struct gfs2_sbd *sdp, struct gfs2_trans *tr) 
{

	struct gfs2_meta_header *mh;

	unsigned int offset;

	struct list_head *head = &sdp->sd_log_le_revoke;

	struct list_head *head = &sdp->sd_log_revokes;

	struct gfs2_bufdata *bd;

	struct page *page;

	unsigned int length;
@@ -661,7 +661,7 @@ static void revoke_lo_before_commit(struct gfs2_sbd *sdp, struct gfs2_trans *tr) 


static void revoke_lo_after_commit(struct gfs2_sbd *sdp, struct gfs2_trans *tr)

{

	struct list_head *head = &sdp->sd_log_le_revoke;

	struct list_head *head = &sdp->sd_log_revokes;

	struct gfs2_bufdata *bd, *tmp;



	/*

fs/gfs2/ops_fstype.c

+2 −2
Original line number Diff line number Diff line
@@ -117,8 +117,8 @@ static struct gfs2_sbd *init_sbd(struct super_block *sb) 


	spin_lock_init(&sdp->sd_log_lock);

	atomic_set(&sdp->sd_log_pinned, 0);

	INIT_LIST_HEAD(&sdp->sd_log_le_revoke);

	INIT_LIST_HEAD(&sdp->sd_log_le_ordered);

	INIT_LIST_HEAD(&sdp->sd_log_revokes);

	INIT_LIST_HEAD(&sdp->sd_log_ordered);

	spin_lock_init(&sdp->sd_ordered_lock);



	init_waitqueue_head(&sdp->sd_log_waitq);