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

Commit e151960a 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:
 "The major feature this time is the "rbm" conversion in the resource
  group code.  The new struct gfs2_rbm specifies the location of an
  allocatable block in (resource group, bitmap, offset) form.  There are
  a number of added helper functions, and later patches then rewrite
  some of the resource group code in terms of this new structure.  Not
  only does this give us a nice code clean up, but it also removes some
  of the previous restrictions where extents could not cross bitmap
  boundaries, for example.

  In addition to that, there are a few bug fixes and clean ups, but the
  rbm work is by far the majority of this patch set in terms of number
  of changed lines."

* git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-3.0-nmw: (27 commits)
  GFS2: Write out dirty inode metadata in delayed deletes
  GFS2: fix s_writers.counter imbalance in gfs2_ail_empty_gl
  GFS2: Fix infinite loop in rbm_find
  GFS2: Consolidate free block searching functions
  GFS2: Get rid of I_MUTEX_QUOTA usage
  GFS2: Stop block extents at the end of bitmaps
  GFS2: Fix unclaimed_blocks() wrapping bug and clean up
  GFS2: Improve block reservation tracing
  GFS2: Fall back to ignoring reservations, if there are no other blocks left
  GFS2: Fix ->show_options() for statfs slow
  GFS2: Use rbm for gfs2_setbit()
  GFS2: Use rbm for gfs2_testbit()
  GFS2: Eliminate unnecessary check for state > 3 in bitfit
  GFS2: Eliminate redundant calls to may_grant
  GFS2: Combine functions gfs2_glock_dq_wait and wait_on_demote
  GFS2: Combine functions gfs2_glock_wait and wait_on_holder
  GFS2: inline __gfs2_glock_schedule_for_reclaim
  GFS2: change function gfs2_direct_IO to use a normal gfs2_glock_dq
  GFS2: rbm code cleanup
  GFS2: Fix case where reservation finished at end of rgrp
  ...
parents a0d271cb 2216db70

fs/gfs2/aops.c

+6 −5
Original line number Diff line number Diff line
@@ -612,6 +612,7 @@ static int gfs2_write_begin(struct file *file, struct address_space *mapping, 
	struct gfs2_sbd *sdp = GFS2_SB(mapping->host);

	struct gfs2_inode *m_ip = GFS2_I(sdp->sd_statfs_inode);

	unsigned int data_blocks = 0, ind_blocks = 0, rblocks;

	unsigned requested = 0;

	int alloc_required;

	int error = 0;

	pgoff_t index = pos >> PAGE_CACHE_SHIFT;
@@ -641,7 +642,8 @@ static int gfs2_write_begin(struct file *file, struct address_space *mapping, 
		if (error)

			goto out_unlock;



		error = gfs2_inplace_reserve(ip, data_blocks + ind_blocks);

		requested = data_blocks + ind_blocks;

		error = gfs2_inplace_reserve(ip, requested);

		if (error)

			goto out_qunlock;

	}
@@ -654,7 +656,7 @@ static int gfs2_write_begin(struct file *file, struct address_space *mapping, 
	if (&ip->i_inode == sdp->sd_rindex)

		rblocks += 2 * RES_STATFS;

	if (alloc_required)

		rblocks += gfs2_rg_blocks(ip);

		rblocks += gfs2_rg_blocks(ip, requested);



	error = gfs2_trans_begin(sdp, rblocks,

				 PAGE_CACHE_SIZE/sdp->sd_sb.sb_bsize);
@@ -868,7 +870,6 @@ static int gfs2_write_end(struct file *file, struct address_space *mapping, 
	brelse(dibh);

failed:

	gfs2_trans_end(sdp);

	if (gfs2_mb_reserved(ip))

	gfs2_inplace_release(ip);

	if (ip->i_res->rs_qa_qd_num)

		gfs2_quota_unlock(ip);
@@ -1023,7 +1024,7 @@ static ssize_t gfs2_direct_IO(int rw, struct kiocb *iocb, 
				  offset, nr_segs, gfs2_get_block_direct,

				  NULL, NULL, 0);

out:

	gfs2_glock_dq_m(1, &gh);

	gfs2_glock_dq(&gh);

	gfs2_holder_uninit(&gh);

	return rv;

}

fs/gfs2/bmap.c

+1 −1
Original line number Diff line number Diff line
@@ -786,7 +786,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->i_res);

		gfs2_rs_deltree(ip, ip->i_res);



	error = gfs2_trans_begin(sdp, rg_blocks + RES_DINODE +

				 RES_INDIRECT + RES_STATFS + RES_QUOTA,

fs/gfs2/file.c

+2 −2
Original line number Diff line number Diff line
@@ -441,7 +441,7 @@ static int gfs2_page_mkwrite(struct vm_area_struct *vma, struct vm_fault *vmf) 
		rblocks += data_blocks ? data_blocks : 1;

	if (ind_blocks || data_blocks) {

		rblocks += RES_STATFS + RES_QUOTA;

		rblocks += gfs2_rg_blocks(ip);

		rblocks += gfs2_rg_blocks(ip, data_blocks + ind_blocks);

	}

	ret = gfs2_trans_begin(sdp, rblocks, 0);

	if (ret)
@@ -845,7 +845,7 @@ static long gfs2_fallocate(struct file *file, int mode, loff_t offset, 
				&max_bytes, &data_blocks, &ind_blocks);



		rblocks = RES_DINODE + ind_blocks + RES_STATFS + RES_QUOTA +

			  RES_RG_HDR + gfs2_rg_blocks(ip);

			  RES_RG_HDR + gfs2_rg_blocks(ip, data_blocks + ind_blocks);

		if (gfs2_is_jdata(ip))

			rblocks += data_blocks ? data_blocks : 1;

fs/gfs2/glock.c

+18 −42
Original line number Diff line number Diff line
@@ -185,20 +185,6 @@ static void gfs2_glock_remove_from_lru(struct gfs2_glock *gl) 
	spin_unlock(&lru_lock);

}



/**

 * __gfs2_glock_schedule_for_reclaim - Add a glock to the reclaim list

 * @gl: the glock

 *

 * If the glock is demotable, then we add it (or move it) to the end

 * of the glock LRU list.

 */



static void __gfs2_glock_schedule_for_reclaim(struct gfs2_glock *gl)

{

	if (demote_ok(gl))

		gfs2_glock_add_to_lru(gl);

}



/**

 * gfs2_glock_put_nolock() - Decrement reference count on glock

 * @gl: The glock to put
@@ -883,7 +869,14 @@ static int gfs2_glock_demote_wait(void *word) 
	return 0;

}



static void wait_on_holder(struct gfs2_holder *gh)

/**

 * gfs2_glock_wait - wait on a glock acquisition

 * @gh: the glock holder

 *

 * Returns: 0 on success

 */



int gfs2_glock_wait(struct gfs2_holder *gh)

{

	unsigned long time1 = jiffies;
@@ -894,12 +887,7 @@ static void wait_on_holder(struct gfs2_holder *gh) 
		gh->gh_gl->gl_hold_time = min(gh->gh_gl->gl_hold_time +

					      GL_GLOCK_HOLD_INCR,

					      GL_GLOCK_MAX_HOLD);

}



static void wait_on_demote(struct gfs2_glock *gl)

{

	might_sleep();

	wait_on_bit(&gl->gl_flags, GLF_DEMOTE, gfs2_glock_demote_wait, TASK_UNINTERRUPTIBLE);

	return gh->gh_error;

}



/**
@@ -929,19 +917,6 @@ static void handle_callback(struct gfs2_glock *gl, unsigned int state, 
	trace_gfs2_demote_rq(gl);

}



/**

 * gfs2_glock_wait - wait on a glock acquisition

 * @gh: the glock holder

 *

 * Returns: 0 on success

 */



int gfs2_glock_wait(struct gfs2_holder *gh)

{

	wait_on_holder(gh);

	return gh->gh_error;

}



void gfs2_print_dbg(struct seq_file *seq, const char *fmt, ...)

{

	struct va_format vaf;
@@ -979,7 +954,7 @@ __acquires(&gl->gl_spin) 
	struct gfs2_sbd *sdp = gl->gl_sbd;

	struct list_head *insert_pt = NULL;

	struct gfs2_holder *gh2;

	int try_lock = 0;

	int try_futile = 0;



	BUG_ON(gh->gh_owner_pid == NULL);

	if (test_and_set_bit(HIF_WAIT, &gh->gh_iflags))
@@ -987,7 +962,7 @@ __acquires(&gl->gl_spin) 


	if (gh->gh_flags & (LM_FLAG_TRY | LM_FLAG_TRY_1CB)) {

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

			try_lock = 1;

			try_futile = !may_grant(gl, gh);

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

			goto fail;

	}
@@ -996,9 +971,8 @@ __acquires(&gl->gl_spin) 
		if (unlikely(gh2->gh_owner_pid == gh->gh_owner_pid &&

		    (gh->gh_gl->gl_ops->go_type != LM_TYPE_FLOCK)))

			goto trap_recursive;

		if (try_lock &&

		    !(gh2->gh_flags & (LM_FLAG_TRY | LM_FLAG_TRY_1CB)) &&

		    !may_grant(gl, gh)) {

		if (try_futile &&

		    !(gh2->gh_flags & (LM_FLAG_TRY | LM_FLAG_TRY_1CB))) {

fail:

			gh->gh_error = GLR_TRYFAILED;

			gfs2_holder_wake(gh);
@@ -1121,8 +1095,9 @@ void gfs2_glock_dq(struct gfs2_holder *gh) 
		    !test_bit(GLF_DEMOTE, &gl->gl_flags))

			fast_path = 1;

	}

	if (!test_bit(GLF_LFLUSH, &gl->gl_flags))

		__gfs2_glock_schedule_for_reclaim(gl);

	if (!test_bit(GLF_LFLUSH, &gl->gl_flags) && demote_ok(gl))

		gfs2_glock_add_to_lru(gl);



	trace_gfs2_glock_queue(gh, 0);

	spin_unlock(&gl->gl_spin);

	if (likely(fast_path))
@@ -1141,7 +1116,8 @@ void gfs2_glock_dq_wait(struct gfs2_holder *gh) 
{

	struct gfs2_glock *gl = gh->gh_gl;

	gfs2_glock_dq(gh);

	wait_on_demote(gl);

	might_sleep();

	wait_on_bit(&gl->gl_flags, GLF_DEMOTE, gfs2_glock_demote_wait, TASK_UNINTERRUPTIBLE);

}



/**

fs/gfs2/glops.c

+1 −0
Original line number Diff line number Diff line
@@ -94,6 +94,7 @@ static void gfs2_ail_empty_gl(struct gfs2_glock *gl) 
	/* A shortened, inline version of gfs2_trans_begin() */

	tr.tr_reserved = 1 + gfs2_struct2blk(sdp, tr.tr_revokes, sizeof(u64));

	tr.tr_ip = (unsigned long)__builtin_return_address(0);

	sb_start_intwrite(sdp->sd_vfs);

	gfs2_log_reserve(sdp, tr.tr_reserved);

	BUG_ON(current->journal_info);

	current->journal_info = &tr;