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

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

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

* git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-nmw: (56 commits)
  [GFS2] Allow journal recovery on read-only mount
  [GFS2] Lockup on error
  [GFS2] Fix page_mkwrite truncation race path
  [GFS2] Fix typo
  [GFS2] Fix write alloc required shortcut calculation
  [GFS2] gfs2_alloc_required performance
  [GFS2] Remove unneeded i_spin
  [GFS2] Reduce inode size by moving i_alloc out of line
  [GFS2] Fix assert in log code
  [GFS2] Fix problems relating to execution of files on GFS2
  [GFS2] Initialize extent_list earlier
  [GFS2] Allow page migration for writeback and ordered pages
  [GFS2] Remove unused variable
  [GFS2] Fix log block mapper
  [GFS2] Minor correction
  [GFS2] Eliminate the no longer needed sd_statfs_mutex
  [GFS2] Incremental patch to fix compiler warning
  [GFS2] Function meta_read optimization
  [GFS2] Only fetch the dinode once in block_map
  [GFS2] Reorganize function gfs2_glmutex_lock
  ...
parents eba0e319 7bc5c414

fs/gfs2/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ obj-$(CONFIG_GFS2_FS) += gfs2.o 
gfs2-y := acl.o bmap.o daemon.o dir.o eaops.o eattr.o glock.o \

	glops.o inode.o lm.o log.o lops.o locking.o main.o meta_io.o \

	mount.o ops_address.o ops_dentry.o ops_export.o ops_file.o \

	ops_fstype.o ops_inode.o ops_super.o ops_vm.o quota.o \

	ops_fstype.o ops_inode.o ops_super.o quota.o \

	recovery.o rgrp.o super.o sys.o trans.o util.o



obj-$(CONFIG_GFS2_FS_LOCKING_NOLOCK) += locking/nolock/

fs/gfs2/bmap.c

+20 −17
Original line number Diff line number Diff line
@@ -59,7 +59,6 @@ struct strip_mine { 
static int gfs2_unstuffer_page(struct gfs2_inode *ip, struct buffer_head *dibh,

			       u64 block, struct page *page)

{

	struct gfs2_sbd *sdp = GFS2_SB(&ip->i_inode);

	struct inode *inode = &ip->i_inode;

	struct buffer_head *bh;

	int release = 0;
@@ -95,7 +94,7 @@ static int gfs2_unstuffer_page(struct gfs2_inode *ip, struct buffer_head *dibh, 
	set_buffer_uptodate(bh);

	if (!gfs2_is_jdata(ip))

		mark_buffer_dirty(bh);

	if (sdp->sd_args.ar_data == GFS2_DATA_ORDERED || gfs2_is_jdata(ip))

	if (!gfs2_is_writeback(ip))

		gfs2_trans_add_bh(ip->i_gl, bh, 0);



	if (release) {
@@ -453,8 +452,8 @@ static inline void bmap_unlock(struct inode *inode, int create) 
 * Returns: errno

 */



int gfs2_block_map(struct inode *inode, u64 lblock, int create,

		   struct buffer_head *bh_map)

int gfs2_block_map(struct inode *inode, sector_t lblock,

		   struct buffer_head *bh_map, int create)

{

	struct gfs2_inode *ip = GFS2_I(inode);

	struct gfs2_sbd *sdp = GFS2_SB(inode);
@@ -470,6 +469,7 @@ int gfs2_block_map(struct inode *inode, u64 lblock, int create, 
	unsigned int maxlen = bh_map->b_size >> inode->i_blkbits;

	struct metapath mp;

	u64 size;

	struct buffer_head *dibh = NULL;



	BUG_ON(maxlen == 0);
@@ -500,6 +500,8 @@ int gfs2_block_map(struct inode *inode, u64 lblock, int create, 
	error = gfs2_meta_inode_buffer(ip, &bh);

	if (error)

		goto out_fail;

	dibh = bh;

	get_bh(dibh);



	for (x = 0; x < end_of_metadata; x++) {

		lookup_block(ip, bh, x, &mp, create, &new, &dblock);
@@ -518,13 +520,8 @@ int gfs2_block_map(struct inode *inode, u64 lblock, int create, 
		if (boundary)

			set_buffer_boundary(bh_map);

		if (new) {

			struct buffer_head *dibh;

			error = gfs2_meta_inode_buffer(ip, &dibh);

			if (!error) {

			gfs2_trans_add_bh(ip->i_gl, dibh, 1);

			gfs2_dinode_out(ip, dibh->b_data);

				brelse(dibh);

			}

			set_buffer_new(bh_map);

			goto out_brelse;

		}
@@ -545,6 +542,8 @@ int gfs2_block_map(struct inode *inode, u64 lblock, int create, 
out_ok:

	error = 0;

out_fail:

	if (dibh)

		brelse(dibh);

	bmap_unlock(inode, create);

	return error;

}
@@ -560,7 +559,7 @@ int gfs2_extent_map(struct inode *inode, u64 lblock, int *new, u64 *dblock, unsi 
	BUG_ON(!new);



	bh.b_size = 1 << (inode->i_blkbits + 5);

	ret = gfs2_block_map(inode, lblock, create, &bh);

	ret = gfs2_block_map(inode, lblock, &bh, create);

	*extlen = bh.b_size >> inode->i_blkbits;

	*dblock = bh.b_blocknr;

	if (buffer_new(&bh))
@@ -684,7 +683,7 @@ static int do_strip(struct gfs2_inode *ip, struct buffer_head *dibh, 
	if (metadata)

		revokes = (height) ? sdp->sd_inptrs : sdp->sd_diptrs;



	error = gfs2_rindex_hold(sdp, &ip->i_alloc.al_ri_gh);

	error = gfs2_rindex_hold(sdp, &ip->i_alloc->al_ri_gh);

	if (error)

		return error;
@@ -786,7 +785,7 @@ static int do_strip(struct gfs2_inode *ip, struct buffer_head *dibh, 
out_rlist:

	gfs2_rlist_free(&rlist);

out:

	gfs2_glock_dq_uninit(&ip->i_alloc.al_ri_gh);

	gfs2_glock_dq_uninit(&ip->i_alloc->al_ri_gh);

	return error;

}
@@ -879,7 +878,6 @@ static int gfs2_block_truncate_page(struct address_space *mapping) 
{

	struct inode *inode = mapping->host;

	struct gfs2_inode *ip = GFS2_I(inode);

	struct gfs2_sbd *sdp = GFS2_SB(inode);

	loff_t from = inode->i_size;

	unsigned long index = from >> PAGE_CACHE_SHIFT;

	unsigned offset = from & (PAGE_CACHE_SIZE-1);
@@ -911,7 +909,7 @@ static int gfs2_block_truncate_page(struct address_space *mapping) 
	err = 0;



	if (!buffer_mapped(bh)) {

		gfs2_get_block(inode, iblock, bh, 0);

		gfs2_block_map(inode, iblock, bh, 0);

		/* unmapped? It's a hole - nothing to do */

		if (!buffer_mapped(bh))

			goto unlock;
@@ -931,7 +929,7 @@ static int gfs2_block_truncate_page(struct address_space *mapping) 
		err = 0;

	}



	if (sdp->sd_args.ar_data == GFS2_DATA_ORDERED || gfs2_is_jdata(ip))

	if (!gfs2_is_writeback(ip))

		gfs2_trans_add_bh(ip->i_gl, bh, 0);



	zero_user_page(page, offset, length, KM_USER0);
@@ -1224,8 +1222,13 @@ int gfs2_write_alloc_required(struct gfs2_inode *ip, u64 offset, 
		do_div(lblock_stop, bsize);

	} else {

		unsigned int shift = sdp->sd_sb.sb_bsize_shift;

		u64 end_of_file = (ip->i_di.di_size + sdp->sd_sb.sb_bsize - 1) >> shift;

		lblock = offset >> shift;

		lblock_stop = (offset + len + sdp->sd_sb.sb_bsize - 1) >> shift;

		if (lblock_stop > end_of_file) {

			*alloc_required = 1;

			return 0;

		}

	}



	for (; lblock < lblock_stop; lblock += extlen) {

fs/gfs2/bmap.h

+1 −1
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ struct gfs2_inode; 
struct page;



int gfs2_unstuff_dinode(struct gfs2_inode *ip, struct page *page);

int gfs2_block_map(struct inode *inode, u64 lblock, int create, struct buffer_head *bh);

int gfs2_block_map(struct inode *inode, sector_t lblock, struct buffer_head *bh, int create);

int gfs2_extent_map(struct inode *inode, u64 lblock, int *new, u64 *dblock, unsigned *extlen);



int gfs2_truncatei(struct gfs2_inode *ip, u64 size);

fs/gfs2/daemon.c

+0 −50
Original line number Diff line number Diff line
@@ -82,56 +82,6 @@ int gfs2_recoverd(void *data) 
	return 0;

}



/**

 * gfs2_logd - Update log tail as Active Items get flushed to in-place blocks

 * @sdp: Pointer to GFS2 superblock

 *

 * Also, periodically check to make sure that we're using the most recent

 * journal index.

 */



int gfs2_logd(void *data)

{

	struct gfs2_sbd *sdp = data;

	struct gfs2_holder ji_gh;

	unsigned long t;

	int need_flush;



	while (!kthread_should_stop()) {

		/* Advance the log tail */



		t = sdp->sd_log_flush_time +

		    gfs2_tune_get(sdp, gt_log_flush_secs) * HZ;



		gfs2_ail1_empty(sdp, DIO_ALL);

		gfs2_log_lock(sdp);

		need_flush = sdp->sd_log_num_buf > gfs2_tune_get(sdp, gt_incore_log_blocks);

		gfs2_log_unlock(sdp);

		if (need_flush || time_after_eq(jiffies, t)) {

			gfs2_log_flush(sdp, NULL);

			sdp->sd_log_flush_time = jiffies;

		}



		/* Check for latest journal index */



		t = sdp->sd_jindex_refresh_time +

		    gfs2_tune_get(sdp, gt_jindex_refresh_secs) * HZ;



		if (time_after_eq(jiffies, t)) {

			if (!gfs2_jindex_hold(sdp, &ji_gh))

				gfs2_glock_dq_uninit(&ji_gh);

			sdp->sd_jindex_refresh_time = jiffies;

		}



		t = gfs2_tune_get(sdp, gt_logd_secs) * HZ;

		if (freezing(current))

			refrigerator();

		schedule_timeout_interruptible(t);

	}



	return 0;

}



/**

 * gfs2_quotad - Write cached quota changes into the quota file

 * @sdp: Pointer to GFS2 superblock

fs/gfs2/daemon.h

+0 −1
Original line number Diff line number Diff line
@@ -12,7 +12,6 @@ 


int gfs2_glockd(void *data);

int gfs2_recoverd(void *data);

int gfs2_logd(void *data);

int gfs2_quotad(void *data);



#endif /* __DAEMON_DOT_H__ */