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

Commit 3a09b1be 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:
  GFS2: Fix recovery stuck bug (try #2)
  GFS2: Fix typo in stuffed file data copy handling
  Revert "GFS2: recovery stuck on transaction lock"
  GFS2: Make "try" lock not try quite so hard
  GFS2: remove dependency on __GFP_NOFAIL
  GFS2: Simplify gfs2_write_alloc_required
  GFS2: Wait for journal id on mount if not specified on mount command line
  GFS2: Use nobh_writepage
parents 7046e668 0809f6ec

fs/gfs2/aops.c

+2 −7
Original line number Diff line number Diff line
@@ -136,10 +136,7 @@ static int gfs2_writeback_writepage(struct page *page, 
	if (ret <= 0)

		return ret;



	ret = mpage_writepage(page, gfs2_get_block_noalloc, wbc);

	if (ret == -EAGAIN)

		ret = block_write_full_page(page, gfs2_get_block_noalloc, wbc);

	return ret;

	return nobh_writepage(page, gfs2_get_block_noalloc, wbc);

}



/**
@@ -637,9 +634,7 @@ static int gfs2_write_begin(struct file *file, struct address_space *mapping, 
		}

	}



	error = gfs2_write_alloc_required(ip, pos, len, &alloc_required);

	if (error)

		goto out_unlock;

	alloc_required = gfs2_write_alloc_required(ip, pos, len);



	if (alloc_required || gfs2_is_jdata(ip))

		gfs2_write_calc_reserv(ip, len, &data_blocks, &ind_blocks);

fs/gfs2/bmap.c

+6 −11
Original line number Diff line number Diff line
@@ -1040,7 +1040,7 @@ static int trunc_start(struct gfs2_inode *ip, u64 size) 
		goto out;



	if (gfs2_is_stuffed(ip)) {

		u64 dsize = size + sizeof(struct gfs2_inode);

		u64 dsize = size + sizeof(struct gfs2_dinode);

		ip->i_disksize = size;

		ip->i_inode.i_mtime = ip->i_inode.i_ctime = CURRENT_TIME;

		gfs2_trans_add_bh(ip->i_gl, dibh, 1);
@@ -1244,13 +1244,12 @@ int gfs2_file_dealloc(struct gfs2_inode *ip) 
 * @ip: the file being written to

 * @offset: the offset to write to

 * @len: the number of bytes being written

 * @alloc_required: set to 1 if an alloc is required, 0 otherwise

 *

 * Returns: errno

 * Returns: 1 if an alloc is required, 0 otherwise

 */



int gfs2_write_alloc_required(struct gfs2_inode *ip, u64 offset,

			      unsigned int len, int *alloc_required)

			      unsigned int len)

{

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

	struct buffer_head bh;
@@ -1258,26 +1257,23 @@ int gfs2_write_alloc_required(struct gfs2_inode *ip, u64 offset, 
	u64 lblock, lblock_stop, size;

	u64 end_of_file;



	*alloc_required = 0;



	if (!len)

		return 0;



	if (gfs2_is_stuffed(ip)) {

		if (offset + len >

		    sdp->sd_sb.sb_bsize - sizeof(struct gfs2_dinode))

			*alloc_required = 1;

			return 1;

		return 0;

	}



	*alloc_required = 1;

	shift = sdp->sd_sb.sb_bsize_shift;

	BUG_ON(gfs2_is_dir(ip));

	end_of_file = (ip->i_disksize + 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)

		return 0;

		return 1;



	size = (lblock_stop - lblock) << shift;

	do {
@@ -1285,12 +1281,11 @@ int gfs2_write_alloc_required(struct gfs2_inode *ip, u64 offset, 
		bh.b_size = size;

		gfs2_block_map(&ip->i_inode, lblock, &bh, 0);

		if (!buffer_mapped(&bh))

			return 0;

			return 1;

		size -= bh.b_size;

		lblock += (bh.b_size >> ip->i_inode.i_blkbits);

	} while(size > 0);



	*alloc_required = 0;

	return 0;

}

fs/gfs2/bmap.h

+1 −1
Original line number Diff line number Diff line
@@ -52,6 +52,6 @@ int gfs2_truncatei(struct gfs2_inode *ip, u64 size); 
int gfs2_truncatei_resume(struct gfs2_inode *ip);

int gfs2_file_dealloc(struct gfs2_inode *ip);

int gfs2_write_alloc_required(struct gfs2_inode *ip, u64 offset,

			      unsigned int len, int *alloc_required);

			      unsigned int len);



#endif /* __BMAP_DOT_H__ */

fs/gfs2/dir.c

+9 −2
Original line number Diff line number Diff line
@@ -955,7 +955,12 @@ static int dir_split_leaf(struct inode *inode, const struct qstr *name) 
	/* Change the pointers.

	   Don't bother distinguishing stuffed from non-stuffed.

	   This code is complicated enough already. */

	lp = kmalloc(half_len * sizeof(__be64), GFP_NOFS | __GFP_NOFAIL);

	lp = kmalloc(half_len * sizeof(__be64), GFP_NOFS);

	if (!lp) {

		error = -ENOMEM;

		goto fail_brelse;

	}



	/*  Change the pointers  */

	for (x = 0; x < half_len; x++)

		lp[x] = cpu_to_be64(bn);
@@ -1063,7 +1068,9 @@ static int dir_double_exhash(struct gfs2_inode *dip) 


	/*  Allocate both the "from" and "to" buffers in one big chunk  */



	buf = kcalloc(3, sdp->sd_hash_bsize, GFP_NOFS | __GFP_NOFAIL);

	buf = kcalloc(3, sdp->sd_hash_bsize, GFP_NOFS);

	if (!buf)

		return -ENOMEM;



	for (block = dip->i_disksize >> sdp->sd_hash_bsize_shift; block--;) {

		error = gfs2_dir_read_data(dip, (char *)buf,

fs/gfs2/file.c

+1 −3
Original line number Diff line number Diff line
@@ -351,7 +351,6 @@ static int gfs2_page_mkwrite(struct vm_area_struct *vma, struct vm_fault *vmf) 
	unsigned long last_index;

	u64 pos = page->index << PAGE_CACHE_SHIFT;

	unsigned int data_blocks, ind_blocks, rblocks;

	int alloc_required = 0;

	struct gfs2_holder gh;

	struct gfs2_alloc *al;

	int ret;
@@ -364,8 +363,7 @@ static int gfs2_page_mkwrite(struct vm_area_struct *vma, struct vm_fault *vmf) 
	set_bit(GLF_DIRTY, &ip->i_gl->gl_flags);

	set_bit(GIF_SW_PAGED, &ip->i_flags);



	ret = gfs2_write_alloc_required(ip, pos, PAGE_CACHE_SIZE, &alloc_required);

	if (ret || !alloc_required)

	if (!gfs2_write_alloc_required(ip, pos, PAGE_CACHE_SIZE))

		goto out_unlock;

	ret = -ENOMEM;

	al = gfs2_alloc_get(ip);