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

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

Merge tag 'gfs2-4.20.fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2 

Pull gfs2 updates from Bob Peterson:
 "We've got 18 patches for this merge window, none of which are very
  major:

   - clean up the gfs2 block allocator to prepare for future performance
     enhancements (Andreas Gruenbacher)

   - fix a use-after-free problem (Andy Price)

   - patches that fix gfs2's broken rgrplvb mount option (me)

   - cleanup patches and error message improvements (me)

   - enable getlabel support (Steve Whitehouse and Abhi Das)

   - flush the glock delete workqueue at exit (Tim Smith)"

* tag 'gfs2-4.20.fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2:
  gfs2: Fix minor typo: couln't versus couldn't.
  gfs2: write revokes should traverse sd_ail1_list in reverse
  gfs2: Pass resource group to rgblk_free
  gfs2: Remove unnecessary gfs2_rlist_alloc parameter
  gfs2: Fix marking bitmaps non-full
  gfs2: Fix some minor typos
  gfs2: Rename bitmap.bi_{len => bytes}
  gfs2: Remove unused RGRP_RSRV_MINBYTES definition
  gfs2: Move rs_{sizehint, rgd_gh} fields into the inode
  gfs2: Clean up out-of-bounds check in gfs2_rbm_from_block
  gfs2: Always check the result of gfs2_rbm_from_block
  gfs2: getlabel support
  GFS2: Flush the GFS2 delete workqueue before stopping the kernel threads
  gfs2: Don't leave s_fs_info pointing to freed memory in init_sbd
  gfs2: Use fs_* functions instead of pr_* function where we can
  gfs2: slow the deluge of io error messages
  gfs2: Don't set GFS2_RDF_UPTODATE when the lvb is updated
  gfs2: improve debug information when lvb mismatches are found
parents e1cbbf40 8e31582a

fs/gfs2/bmap.c

+2 −2
Original line number Diff line number Diff line
@@ -1566,7 +1566,7 @@ static int sweep_bh_for_rgrps(struct gfs2_inode *ip, struct gfs2_holder *rd_gh, 
			continue;

		}

		if (bstart) {

			__gfs2_free_blocks(ip, bstart, (u32)blen, meta);

			__gfs2_free_blocks(ip, rgd, bstart, (u32)blen, meta);

			(*btotal) += blen;

			gfs2_add_inode_blocks(&ip->i_inode, -blen);

		}
@@ -1574,7 +1574,7 @@ static int sweep_bh_for_rgrps(struct gfs2_inode *ip, struct gfs2_holder *rd_gh, 
		blen = 1;

	}

	if (bstart) {

		__gfs2_free_blocks(ip, bstart, (u32)blen, meta);

		__gfs2_free_blocks(ip, rgd, bstart, (u32)blen, meta);

		(*btotal) += blen;

		gfs2_add_inode_blocks(&ip->i_inode, -blen);

	}

fs/gfs2/dir.c

+17 −11
Original line number Diff line number Diff line
@@ -506,7 +506,8 @@ static int gfs2_dirent_gather(const struct gfs2_dirent *dent, 
 * For now the most important thing is to check that the various sizes

 * are correct.

 */

static int gfs2_check_dirent(struct gfs2_dirent *dent, unsigned int offset,

static int gfs2_check_dirent(struct gfs2_sbd *sdp,

			     struct gfs2_dirent *dent, unsigned int offset,

			     unsigned int size, unsigned int len, int first)

{

	const char *msg = "gfs2_dirent too small";
@@ -528,12 +529,12 @@ static int gfs2_check_dirent(struct gfs2_dirent *dent, unsigned int offset, 
		goto error;

	return 0;

error:

	pr_warn("%s: %s (%s)\n",

	fs_warn(sdp, "%s: %s (%s)\n",

		__func__, msg, first ? "first in block" : "not first in block");

	return -EIO;

}



static int gfs2_dirent_offset(const void *buf)

static int gfs2_dirent_offset(struct gfs2_sbd *sdp, const void *buf)

{

	const struct gfs2_meta_header *h = buf;

	int offset;
@@ -552,7 +553,8 @@ static int gfs2_dirent_offset(const void *buf) 
	}

	return offset;

wrong_type:

	pr_warn("%s: wrong block type %u\n", __func__, be32_to_cpu(h->mh_type));

	fs_warn(sdp, "%s: wrong block type %u\n", __func__,

		be32_to_cpu(h->mh_type));

	return -1;

}
@@ -566,7 +568,7 @@ static struct gfs2_dirent *gfs2_dirent_scan(struct inode *inode, void *buf, 
	unsigned size;

	int ret = 0;



	ret = gfs2_dirent_offset(buf);

	ret = gfs2_dirent_offset(GFS2_SB(inode), buf);

	if (ret < 0)

		goto consist_inode;
@@ -574,7 +576,7 @@ static struct gfs2_dirent *gfs2_dirent_scan(struct inode *inode, void *buf, 
	prev = NULL;

	dent = buf + offset;

	size = be16_to_cpu(dent->de_rec_len);

	if (gfs2_check_dirent(dent, offset, size, len, 1))

	if (gfs2_check_dirent(GFS2_SB(inode), dent, offset, size, len, 1))

		goto consist_inode;

	do {

		ret = scan(dent, name, opaque);
@@ -586,7 +588,8 @@ static struct gfs2_dirent *gfs2_dirent_scan(struct inode *inode, void *buf, 
		prev = dent;

		dent = buf + offset;

		size = be16_to_cpu(dent->de_rec_len);

		if (gfs2_check_dirent(dent, offset, size, len, 0))

		if (gfs2_check_dirent(GFS2_SB(inode), dent, offset, size,

				      len, 0))

			goto consist_inode;

	} while(1);
@@ -1043,7 +1046,7 @@ static int dir_split_leaf(struct inode *inode, const struct qstr *name) 
	len = BIT(dip->i_depth - be16_to_cpu(oleaf->lf_depth));

	half_len = len >> 1;

	if (!half_len) {

		pr_warn("i_depth %u lf_depth %u index %u\n",

		fs_warn(GFS2_SB(inode), "i_depth %u lf_depth %u index %u\n",

			dip->i_depth, be16_to_cpu(oleaf->lf_depth), index);

		gfs2_consist_inode(dip);

		error = -EIO;
@@ -1351,7 +1354,7 @@ static int gfs2_set_cookies(struct gfs2_sbd *sdp, struct buffer_head *bh, 
		if (!sdp->sd_args.ar_loccookie)

			continue;

		offset = (char *)(darr[i]) -

			 (bh->b_data + gfs2_dirent_offset(bh->b_data));

			(bh->b_data + gfs2_dirent_offset(sdp, bh->b_data));

		offset /= GFS2_MIN_DIRENT_SIZE;

		offset += leaf_nr * sdp->sd_max_dents_per_leaf;

		if (offset >= GFS2_USE_HASH_FLAG ||
@@ -2018,7 +2021,7 @@ static int leaf_dealloc(struct gfs2_inode *dip, u32 index, u32 len, 
		l_blocks++;

	}



	gfs2_rlist_alloc(&rlist, LM_ST_EXCLUSIVE);

	gfs2_rlist_alloc(&rlist);



	for (x = 0; x < rlist.rl_rgrps; x++) {

		struct gfs2_rgrpd *rgd = gfs2_glock2rgrp(rlist.rl_ghs[x].gh_gl);
@@ -2039,6 +2042,8 @@ static int leaf_dealloc(struct gfs2_inode *dip, u32 index, u32 len, 
	bh = leaf_bh;



	for (blk = leaf_no; blk; blk = nblk) {

		struct gfs2_rgrpd *rgd;



		if (blk != leaf_no) {

			error = get_leaf(dip, blk, &bh);

			if (error)
@@ -2049,7 +2054,8 @@ static int leaf_dealloc(struct gfs2_inode *dip, u32 index, u32 len, 
		if (blk != leaf_no)

			brelse(bh);



		gfs2_free_meta(dip, blk, 1);

		rgd = gfs2_blk2rgrpd(sdp, blk, true);

		gfs2_free_meta(dip, rgd, blk, 1);

		gfs2_add_inode_blocks(&dip->i_inode, -1);

	}

fs/gfs2/file.c

+16 −2
Original line number Diff line number Diff line
@@ -314,6 +314,17 @@ static int gfs2_set_flags(struct file *filp, u32 __user *ptr) 
	return do_gfs2_set_flags(filp, gfsflags, mask);

}



static int gfs2_getlabel(struct file *filp, char __user *label)

{

	struct inode *inode = file_inode(filp);

	struct gfs2_sbd *sdp = GFS2_SB(inode);



	if (copy_to_user(label, sdp->sd_sb.sb_locktable, GFS2_LOCKNAME_LEN))

		return -EFAULT;



	return 0;

}



static long gfs2_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)

{

	switch(cmd) {
@@ -323,7 +334,10 @@ static long gfs2_ioctl(struct file *filp, unsigned int cmd, unsigned long arg) 
		return gfs2_set_flags(filp, (u32 __user *)arg);

	case FITRIM:

		return gfs2_fitrim(filp, (void __user *)arg);

	case FS_IOC_GETFSLABEL:

		return gfs2_getlabel(filp, (char __user *)arg);

	}



	return -ENOTTY;

}
@@ -347,8 +361,8 @@ static void gfs2_size_hint(struct file *filep, loff_t offset, size_t size) 
	size_t blks = (size + sdp->sd_sb.sb_bsize - 1) >> sdp->sd_sb.sb_bsize_shift;

	int hint = min_t(size_t, INT_MAX, blks);



	if (hint > atomic_read(&ip->i_res.rs_sizehint))

		atomic_set(&ip->i_res.rs_sizehint, hint);

	if (hint > atomic_read(&ip->i_sizehint))

		atomic_set(&ip->i_sizehint, hint);

}



/**

fs/gfs2/glock.c

+9 −8
Original line number Diff line number Diff line
@@ -494,7 +494,8 @@ static void finish_xmote(struct gfs2_glock *gl, unsigned int ret) 
			do_xmote(gl, gh, LM_ST_UNLOCKED);

			break;

		default: /* Everything else */

			pr_err("wanted %u got %u\n", gl->gl_target, state);

			fs_err(gl->gl_name.ln_sbd, "wanted %u got %u\n",

			       gl->gl_target, state);

			GLOCK_BUG_ON(gl, 1);

		}

		spin_unlock(&gl->gl_lockref.lock);
@@ -577,7 +578,7 @@ __acquires(&gl->gl_lockref.lock) 
			gfs2_glock_queue_work(gl, 0);

		}

		else if (ret) {

			pr_err("lm_lock ret %d\n", ret);

			fs_err(sdp, "lm_lock ret %d\n", ret);

			GLOCK_BUG_ON(gl, !test_bit(SDF_SHUTDOWN,

						   &sdp->sd_flags));

		}
@@ -1064,13 +1065,13 @@ __acquires(&gl->gl_lockref.lock) 
	return;



trap_recursive:

	pr_err("original: %pSR\n", (void *)gh2->gh_ip);

	pr_err("pid: %d\n", pid_nr(gh2->gh_owner_pid));

	pr_err("lock type: %d req lock state : %d\n",

	fs_err(sdp, "original: %pSR\n", (void *)gh2->gh_ip);

	fs_err(sdp, "pid: %d\n", pid_nr(gh2->gh_owner_pid));

	fs_err(sdp, "lock type: %d req lock state : %d\n",

	       gh2->gh_gl->gl_name.ln_type, gh2->gh_state);

	pr_err("new: %pSR\n", (void *)gh->gh_ip);

	pr_err("pid: %d\n", pid_nr(gh->gh_owner_pid));

	pr_err("lock type: %d req lock state : %d\n",

	fs_err(sdp, "new: %pSR\n", (void *)gh->gh_ip);

	fs_err(sdp, "pid: %d\n", pid_nr(gh->gh_owner_pid));

	fs_err(sdp, "lock type: %d req lock state : %d\n",

	       gh->gh_gl->gl_name.ln_type, gh->gh_state);

	gfs2_dump_glock(NULL, gl);

	BUG();

fs/gfs2/incore.h

+4 −5
Original line number Diff line number Diff line
@@ -92,7 +92,7 @@ struct gfs2_bitmap { 
	unsigned long bi_flags;

	u32 bi_offset;

	u32 bi_start;

	u32 bi_len;

	u32 bi_bytes;

	u32 bi_blocks;

};
@@ -309,10 +309,6 @@ struct gfs2_qadata { /* quota allocation data */ 
*/



struct gfs2_blkreserv {

	/* components used during write (step 1): */

	atomic_t rs_sizehint;         /* hint of the write size */



	struct gfs2_holder rs_rgd_gh; /* Filled in by get_local_rgrp */

	struct rb_node rs_node;       /* link to other block reservations */

	struct gfs2_rbm rs_rbm;       /* Start of reservation */

	u32 rs_free;                  /* how many blocks are still free */
@@ -417,8 +413,10 @@ struct gfs2_inode { 
	struct gfs2_holder i_iopen_gh;

	struct gfs2_holder i_gh; /* for prepare/commit_write only */

	struct gfs2_qadata *i_qadata; /* quota allocation data */

	struct gfs2_holder i_rgd_gh;

	struct gfs2_blkreserv i_res; /* rgrp multi-block reservation */

	u64 i_goal;	/* goal block for allocations */

	atomic_t i_sizehint;  /* hint of the write size */

	struct rw_semaphore i_rw_mutex;

	struct list_head i_ordered;

	struct list_head i_trunc_list;
@@ -623,6 +621,7 @@ enum { 
	SDF_RORECOVERY		= 7, /* read only recovery */

	SDF_SKIP_DLM_UNLOCK	= 8,

	SDF_FORCE_AIL_FLUSH     = 9,

	SDF_AIL1_IO_ERROR	= 10,

};



enum gfs2_freeze_state {