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

Commit e72859b8 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-3.0-nmw 

Pull GFS2 updates from Steven Whitehouse:
 "There is not a whole lot of change this time - there are some further
  changes which are in the works, but those will be held over until next
  time.

  Here there are some clean ups to inode creation, the addition of an
  origin (local or remote) indicator to glock demote requests, removal
  of one of the remaining GFP_NOFAIL allocations during log flushes, one
  minor clean up, and a one liner bug fix."

* git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-3.0-nmw:
  GFS2: Flush work queue before clearing glock hash tables
  GFS2: Add origin indicator to glock demote tracing
  GFS2: Add origin indicator to glock callbacks
  GFS2: replace gfs2_ail structure with gfs2_trans
  GFS2: Remove vestigial parameter ip from function rs_deltree
  GFS2: Use gfs2_dinode_out() in the inode create path
  GFS2: Remove gfs2_refresh_inode from inode creation path
  GFS2: Clean up inode creation path
parents c9ef7139 222cb538

fs/gfs2/aops.c

+1 −1
Original line number Diff line number Diff line
@@ -1055,7 +1055,7 @@ int gfs2_releasepage(struct page *page, gfp_t gfp_mask) 
		if (atomic_read(&bh->b_count))

			goto cannot_release;

		bd = bh->b_private;

		if (bd && bd->bd_ail)

		if (bd && bd->bd_tr)

			goto cannot_release;

		if (buffer_pinned(bh) || buffer_dirty(bh))

			goto not_possible;

fs/gfs2/bmap.c

+1 −1
Original line number Diff line number Diff line
@@ -787,7 +787,7 @@ static int do_strip(struct gfs2_inode *ip, struct buffer_head *dibh, 
		goto out_rlist;



	if (gfs2_rs_active(ip->i_res)) /* needs to be done with the rgrp glock held */

		gfs2_rs_deltree(ip, ip->i_res);

		gfs2_rs_deltree(ip->i_res);



	error = gfs2_trans_begin(sdp, rg_blocks + RES_DINODE +

				 RES_INDIRECT + RES_STATFS + RES_QUOTA,

fs/gfs2/glock.c

+8 −20
Original line number Diff line number Diff line
@@ -912,7 +912,7 @@ int gfs2_glock_wait(struct gfs2_holder *gh) 
 */



static void handle_callback(struct gfs2_glock *gl, unsigned int state,

			    unsigned long delay)

			    unsigned long delay, bool remote)

{

	int bit = delay ? GLF_PENDING_DEMOTE : GLF_DEMOTE;
@@ -925,8 +925,8 @@ static void handle_callback(struct gfs2_glock *gl, unsigned int state, 
		gl->gl_demote_state = LM_ST_UNLOCKED;

	}

	if (gl->gl_ops->go_callback)

		gl->gl_ops->go_callback(gl);

	trace_gfs2_demote_rq(gl);

		gl->gl_ops->go_callback(gl, remote);

	trace_gfs2_demote_rq(gl, remote);

}



void gfs2_print_dbg(struct seq_file *seq, const char *fmt, ...)
@@ -1091,7 +1091,7 @@ void gfs2_glock_dq(struct gfs2_holder *gh) 


	spin_lock(&gl->gl_spin);

	if (gh->gh_flags & GL_NOCACHE)

		handle_callback(gl, LM_ST_UNLOCKED, 0);

		handle_callback(gl, LM_ST_UNLOCKED, 0, false);



	list_del_init(&gh->gh_list);

	if (find_first_holder(gl) == NULL) {
@@ -1279,19 +1279,6 @@ void gfs2_glock_dq_m(unsigned int num_gh, struct gfs2_holder *ghs) 
		gfs2_glock_dq(&ghs[num_gh]);

}



/**

 * gfs2_glock_dq_uninit_m - release multiple glocks

 * @num_gh: the number of structures

 * @ghs: an array of struct gfs2_holder structures

 *

 */



void gfs2_glock_dq_uninit_m(unsigned int num_gh, struct gfs2_holder *ghs)

{

	while (num_gh--)

		gfs2_glock_dq_uninit(&ghs[num_gh]);

}



void gfs2_glock_cb(struct gfs2_glock *gl, unsigned int state)

{

	unsigned long delay = 0;
@@ -1309,7 +1296,7 @@ void gfs2_glock_cb(struct gfs2_glock *gl, unsigned int state) 
	}



	spin_lock(&gl->gl_spin);

	handle_callback(gl, state, delay);

	handle_callback(gl, state, delay, true);

	spin_unlock(&gl->gl_spin);

	if (queue_delayed_work(glock_workqueue, &gl->gl_work, delay) == 0)

		gfs2_glock_put(gl);
@@ -1422,7 +1409,7 @@ __acquires(&lru_lock) 
		spin_unlock(&lru_lock);

		spin_lock(&gl->gl_spin);

		if (demote_ok(gl))

			handle_callback(gl, LM_ST_UNLOCKED, 0);

			handle_callback(gl, LM_ST_UNLOCKED, 0, false);

		WARN_ON(!test_and_clear_bit(GLF_LOCK, &gl->gl_flags));

		smp_mb__after_clear_bit();

		if (queue_delayed_work(glock_workqueue, &gl->gl_work, 0) == 0)
@@ -1547,7 +1534,7 @@ static void clear_glock(struct gfs2_glock *gl) 


	spin_lock(&gl->gl_spin);

	if (gl->gl_state != LM_ST_UNLOCKED)

		handle_callback(gl, LM_ST_UNLOCKED, 0);

		handle_callback(gl, LM_ST_UNLOCKED, 0, false);

	spin_unlock(&gl->gl_spin);

	gfs2_glock_hold(gl);

	if (queue_delayed_work(glock_workqueue, &gl->gl_work, 0) == 0)
@@ -1590,6 +1577,7 @@ static void dump_glock_func(struct gfs2_glock *gl) 
void gfs2_gl_hash_clear(struct gfs2_sbd *sdp)

{

	set_bit(SDF_SKIP_DLM_UNLOCK, &sdp->sd_flags);

	flush_workqueue(glock_workqueue);

	glock_hash_walk(clear_glock, sdp);

	flush_workqueue(glock_workqueue);

	wait_event(sdp->sd_glock_wait, atomic_read(&sdp->sd_glock_disposal) == 0);

fs/gfs2/glock.h

+0 −1
Original line number Diff line number Diff line
@@ -201,7 +201,6 @@ extern int gfs2_glock_nq_num(struct gfs2_sbd *sdp, u64 number, 
			     struct gfs2_holder *gh);

extern int gfs2_glock_nq_m(unsigned int num_gh, struct gfs2_holder *ghs);

extern void gfs2_glock_dq_m(unsigned int num_gh, struct gfs2_holder *ghs);

extern void gfs2_glock_dq_uninit_m(unsigned int num_gh, struct gfs2_holder *ghs);

extern int gfs2_dump_glock(struct seq_file *seq, const struct gfs2_glock *gl);

#define GLOCK_BUG_ON(gl,x) do { if (unlikely(x)) { gfs2_dump_glock(NULL, gl); BUG(); } } while(0)

extern __printf(2, 3)

fs/gfs2/glops.c

+2 −2
Original line number Diff line number Diff line
@@ -515,12 +515,12 @@ static int trans_go_demote_ok(const struct gfs2_glock *gl) 
 *

 * gl_spin lock is held while calling this

 */

static void iopen_go_callback(struct gfs2_glock *gl)

static void iopen_go_callback(struct gfs2_glock *gl, bool remote)

{

	struct gfs2_inode *ip = (struct gfs2_inode *)gl->gl_object;

	struct gfs2_sbd *sdp = gl->gl_sbd;



	if (sdp->sd_vfs->s_flags & MS_RDONLY)

	if (!remote || (sdp->sd_vfs->s_flags & MS_RDONLY))

		return;



	if (gl->gl_demote_state == LM_ST_UNLOCKED &&