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

Commit 79140bc4 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: rename causes kernel Oops
  GFS2: BUG in gfs2_adjust_quota
  GFS2: Fix kernel NULL pointer dereference by dlm_astd
  GFS2: recovery stuck on transaction lock
  GFS2: O_TRUNC not working on stuffed files across cluster
parents cc10b6ff 728a756b

fs/gfs2/bmap.c

+1 −0
Original line number Diff line number Diff line
@@ -1041,6 +1041,7 @@ static int trunc_start(struct gfs2_inode *ip, u64 size) 


	if (gfs2_is_stuffed(ip)) {

		u64 dsize = size + sizeof(struct gfs2_inode);

		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);

		gfs2_dinode_out(ip, dibh->b_data);

fs/gfs2/dir.c

+1 −1
Original line number Diff line number Diff line
@@ -392,7 +392,7 @@ static int gfs2_dirent_find_space(const struct gfs2_dirent *dent, 
	unsigned totlen = be16_to_cpu(dent->de_rec_len);



	if (gfs2_dirent_sentinel(dent))

		actual = GFS2_DIRENT_SIZE(0);

		actual = 0;

	if (totlen - actual >= required)

		return 1;

	return 0;

fs/gfs2/glock.c

+10 −0
Original line number Diff line number Diff line
@@ -706,8 +706,18 @@ static void glock_work_func(struct work_struct *work) 
{

	unsigned long delay = 0;

	struct gfs2_glock *gl = container_of(work, struct gfs2_glock, gl_work.work);

	struct gfs2_holder *gh;

	int drop_ref = 0;



	if (unlikely(test_bit(GLF_FROZEN, &gl->gl_flags))) {

		spin_lock(&gl->gl_spin);

		gh = find_first_waiter(gl);

		if (gh && (gh->gh_flags & LM_FLAG_NOEXP) &&

		    test_and_clear_bit(GLF_FROZEN, &gl->gl_flags))

			set_bit(GLF_REPLY_PENDING, &gl->gl_flags);

		spin_unlock(&gl->gl_spin);

	}



	if (test_and_clear_bit(GLF_REPLY_PENDING, &gl->gl_flags)) {

		finish_xmote(gl, gl->gl_reply);

		drop_ref = 1;

fs/gfs2/inode.c

+8 −4
Original line number Diff line number Diff line
@@ -169,7 +169,7 @@ struct inode *gfs2_inode_lookup(struct super_block *sb, 
{

	struct inode *inode;

	struct gfs2_inode *ip;

	struct gfs2_glock *io_gl;

	struct gfs2_glock *io_gl = NULL;

	int error;



	inode = gfs2_iget(sb, no_addr);
@@ -198,6 +198,7 @@ struct inode *gfs2_inode_lookup(struct super_block *sb, 
		ip->i_iopen_gh.gh_gl->gl_object = ip;



		gfs2_glock_put(io_gl);

		io_gl = NULL;



		if ((type == DT_UNKNOWN) && (no_formal_ino == 0))

			goto gfs2_nfsbypass;
@@ -228,6 +229,7 @@ struct inode *gfs2_inode_lookup(struct super_block *sb, 
fail_glock:

	gfs2_glock_dq(&ip->i_iopen_gh);

fail_iopen:

	if (io_gl)

		gfs2_glock_put(io_gl);

fail_put:

	if (inode->i_state & I_NEW)
@@ -256,7 +258,7 @@ void gfs2_process_unlinked_inode(struct super_block *sb, u64 no_addr) 
{

	struct gfs2_sbd *sdp;

	struct gfs2_inode *ip;

	struct gfs2_glock *io_gl;

	struct gfs2_glock *io_gl = NULL;

	int error;

	struct gfs2_holder gh;

	struct inode *inode;
@@ -293,6 +295,7 @@ void gfs2_process_unlinked_inode(struct super_block *sb, u64 no_addr) 


	ip->i_iopen_gh.gh_gl->gl_object = ip;

	gfs2_glock_put(io_gl);

	io_gl = NULL;



	inode->i_mode = DT2IF(DT_UNKNOWN);
@@ -319,6 +322,7 @@ void gfs2_process_unlinked_inode(struct super_block *sb, u64 no_addr) 
fail_glock:

	gfs2_glock_dq(&ip->i_iopen_gh);

fail_iopen:

	if (io_gl)

		gfs2_glock_put(io_gl);

fail_put:

	ip->i_gl->gl_object = NULL;

fs/gfs2/quota.c

+3 −5
Original line number Diff line number Diff line
@@ -694,10 +694,8 @@ static int gfs2_adjust_quota(struct gfs2_inode *ip, loff_t loc, 
		if (!buffer_mapped(bh))

			goto unlock_out;

		/* If it's a newly allocated disk block for quota, zero it */

		if (buffer_new(bh)) {

			memset(bh->b_data, 0, bh->b_size);

			set_buffer_uptodate(bh);

		}

		if (buffer_new(bh))

			zero_user(page, pos - blocksize, bh->b_size);

	}



	if (PageUptodate(page))
@@ -723,7 +721,7 @@ static int gfs2_adjust_quota(struct gfs2_inode *ip, loff_t loc, 


	/* If quota straddles page boundary, we need to update the rest of the

	 * quota at the beginning of the next page */

	if (offset != 0) { /* first page, offset is closer to PAGE_CACHE_SIZE */

	if ((offset + sizeof(struct gfs2_quota)) > PAGE_CACHE_SIZE) {

		ptr = ptr + nbytes;

		nbytes = sizeof(struct gfs2_quota) - nbytes;

		offset = 0;