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

Commit 5dcd07b9 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: Resolve inode eviction and ail list interaction bug
  GFS2: Fix race during filesystem mount
  GFS2: force a log flush when invalidating the rindex glock
parents 51414d41 380f7c65

fs/gfs2/aops.c

+3 −0
Original line number Diff line number Diff line
@@ -1069,6 +1069,7 @@ int gfs2_releasepage(struct page *page, gfp_t gfp_mask) 
		return 0;



	gfs2_log_lock(sdp);

	spin_lock(&sdp->sd_ail_lock);

	head = bh = page_buffers(page);

	do {

		if (atomic_read(&bh->b_count))
@@ -1080,6 +1081,7 @@ int gfs2_releasepage(struct page *page, gfp_t gfp_mask) 
			goto not_possible;

		bh = bh->b_this_page;

	} while(bh != head);

	spin_unlock(&sdp->sd_ail_lock);

	gfs2_log_unlock(sdp);



	head = bh = page_buffers(page);
@@ -1112,6 +1114,7 @@ not_possible: /* Should never happen */ 
	WARN_ON(buffer_dirty(bh));

	WARN_ON(buffer_pinned(bh));

cannot_release:

	spin_unlock(&sdp->sd_ail_lock);

	gfs2_log_unlock(sdp);

	return 0;

}

fs/gfs2/glops.c

+5 −3
Original line number Diff line number Diff line
@@ -47,10 +47,10 @@ static void __gfs2_ail_flush(struct gfs2_glock *gl) 
				bd_ail_gl_list);

		bh = bd->bd_bh;

		gfs2_remove_from_ail(bd);

		spin_unlock(&sdp->sd_ail_lock);



		bd->bd_bh = NULL;

		bh->b_private = NULL;

		spin_unlock(&sdp->sd_ail_lock);



		bd->bd_blkno = bh->b_blocknr;

		gfs2_log_lock(sdp);

		gfs2_assert_withdraw(sdp, !buffer_busy(bh));
@@ -221,8 +221,10 @@ static void inode_go_inval(struct gfs2_glock *gl, int flags) 
		}

	}



	if (ip == GFS2_I(gl->gl_sbd->sd_rindex))

	if (ip == GFS2_I(gl->gl_sbd->sd_rindex)) {

		gfs2_log_flush(gl->gl_sbd, NULL);

		gl->gl_sbd->sd_rindex_uptodate = 0;

	}

	if (ip && S_ISREG(ip->i_inode.i_mode))

		truncate_inode_pages(ip->i_inode.i_mapping, 0);

}

fs/gfs2/incore.h

+2 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
#include <linux/buffer_head.h>

#include <linux/rcupdate.h>

#include <linux/rculist_bl.h>

#include <linux/completion.h>



#define DIO_WAIT	0x00000010

#define DIO_METADATA	0x00000020
@@ -546,6 +547,7 @@ struct gfs2_sbd { 
	struct gfs2_glock *sd_trans_gl;

	wait_queue_head_t sd_glock_wait;

	atomic_t sd_glock_disposal;

	struct completion sd_locking_init;



	/* Inode Stuff */

fs/gfs2/log.c

+1 −0
Original line number Diff line number Diff line
@@ -903,6 +903,7 @@ void gfs2_meta_syncfs(struct gfs2_sbd *sdp) 
		if (gfs2_ail1_empty(sdp))

			break;

	}

	gfs2_log_flush(sdp, NULL);

}



static inline int gfs2_jrnl_flush_reqd(struct gfs2_sbd *sdp)

fs/gfs2/ops_fstype.c

+3 −0
Original line number Diff line number Diff line
@@ -72,6 +72,7 @@ static struct gfs2_sbd *init_sbd(struct super_block *sb) 


	init_waitqueue_head(&sdp->sd_glock_wait);

	atomic_set(&sdp->sd_glock_disposal, 0);

	init_completion(&sdp->sd_locking_init);

	spin_lock_init(&sdp->sd_statfs_spin);



	spin_lock_init(&sdp->sd_rindex_spin);
@@ -1017,11 +1018,13 @@ hostdata_error: 
		fsname++;

	if (lm->lm_mount == NULL) {

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

		complete(&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);

	return ret;

}