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

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

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

Pull GFS2 updates from Bob Peterson:
 "We've got nine patches this time:

   - Abhi Das has two patches that fix a GFS2 splice issue (and an
     adjustment).

   - Ben Marzinski has a patch which allows the proper unmount of a GFS2
     file system after hitting a withdraw error.

   - I have a patch to fix a problem where GFS2 would dereference an
     error value, plus three cosmetic / refactoring patches.

   - Daniel DeFreez has a patch to fix two glock reference count
     problems, where GFS2 was not properly "uninitializing" its glock
     holder on error paths.

   - Denys Vlasenko has a patch to change a function to not be inlined,
     thus reducing the memory footprint of the GFS2 module"

* tag 'gfs2-4.7.fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2:
  GFS2: Refactor gfs2_remove_from_journal
  GFS2: Remove allocation parms from gfs2_rbm_find
  gfs2: use inode_lock/unlock instead of accessing i_mutex directly
  GFS2: Add calls to gfs2_holder_uninit in two error handlers
  GFS2: Don't dereference inode in gfs2_inode_lookup until it's valid
  GFS2: fs/gfs2/glock.c: Deinline do_error, save 1856 bytes
  gfs2: Use gfs2 wrapper to sync inode before calling generic_file_splice_read()
  GFS2: Get rid of dead code in inode_go_demote_ok
  GFS2: ignore unlock failures after withdraw
parents e7f44b65 68cd4ce2

fs/gfs2/aops.c

+3 −2
Original line number Diff line number Diff line
@@ -977,7 +977,7 @@ static void gfs2_discard(struct gfs2_sbd *sdp, struct buffer_head *bh) 
		if (!list_empty(&bd->bd_list) && !buffer_pinned(bh))

			list_del_init(&bd->bd_list);

		else

			gfs2_remove_from_journal(bh, current->journal_info, 0);

			gfs2_remove_from_journal(bh, REMOVE_JDATA);

	}

	bh->b_bdev = NULL;

	clear_buffer_mapped(bh);
@@ -1063,7 +1063,7 @@ static ssize_t gfs2_direct_IO(struct kiocb *iocb, struct iov_iter *iter) 
	gfs2_holder_init(ip->i_gl, LM_ST_DEFERRED, 0, &gh);

	rv = gfs2_glock_nq(&gh);

	if (rv)

		return rv;

		goto out_uninit;

	rv = gfs2_ok_for_dio(ip, offset);

	if (rv != 1)

		goto out; /* dio not valid, fall back to buffered i/o */
@@ -1102,6 +1102,7 @@ static ssize_t gfs2_direct_IO(struct kiocb *iocb, struct iov_iter *iter) 
				  gfs2_get_block_direct, NULL, NULL, 0);

out:

	gfs2_glock_dq(&gh);

out_uninit:

	gfs2_holder_uninit(&gh);

	return rv;

}

fs/gfs2/file.c

+28 −3
Original line number Diff line number Diff line
@@ -160,7 +160,7 @@ static int gfs2_get_flags(struct file *filp, u32 __user *ptr) 
	gfs2_holder_init(ip->i_gl, LM_ST_SHARED, 0, &gh);

	error = gfs2_glock_nq(&gh);

	if (error)

		return error;

		goto out_uninit;



	fsflags = fsflags_cvt(gfs2_to_fsflags, ip->i_diskflags);

	if (!S_ISDIR(inode->i_mode) && ip->i_diskflags & GFS2_DIF_JDATA)
@@ -169,6 +169,7 @@ static int gfs2_get_flags(struct file *filp, u32 __user *ptr) 
		error = -EFAULT;



	gfs2_glock_dq(&gh);

out_uninit:

	gfs2_holder_uninit(&gh);

	return error;

}
@@ -953,6 +954,30 @@ static long gfs2_fallocate(struct file *file, int mode, loff_t offset, loff_t le 
	return ret;

}



static ssize_t gfs2_file_splice_read(struct file *in, loff_t *ppos,

				     struct pipe_inode_info *pipe, size_t len,

				     unsigned int flags)

{

	struct inode *inode = in->f_mapping->host;

	struct gfs2_inode *ip = GFS2_I(inode);

	struct gfs2_holder gh;

	int ret;



	inode_lock(inode);



	ret = gfs2_glock_nq_init(ip->i_gl, LM_ST_SHARED, 0, &gh);

	if (ret) {

		inode_unlock(inode);

		return ret;

	}



	gfs2_glock_dq_uninit(&gh);

	inode_unlock(inode);



	return generic_file_splice_read(in, ppos, pipe, len, flags);

}





static ssize_t gfs2_file_splice_write(struct pipe_inode_info *pipe,

				      struct file *out, loff_t *ppos,

				      size_t len, unsigned int flags)
@@ -1115,7 +1140,7 @@ const struct file_operations gfs2_file_fops = { 
	.fsync		= gfs2_fsync,

	.lock		= gfs2_lock,

	.flock		= gfs2_flock,

	.splice_read	= generic_file_splice_read,

	.splice_read	= gfs2_file_splice_read,

	.splice_write	= gfs2_file_splice_write,

	.setlease	= simple_nosetlease,

	.fallocate	= gfs2_fallocate,
@@ -1143,7 +1168,7 @@ const struct file_operations gfs2_file_fops_nolock = { 
	.open		= gfs2_open,

	.release	= gfs2_release,

	.fsync		= gfs2_fsync,

	.splice_read	= generic_file_splice_read,

	.splice_read	= gfs2_file_splice_read,

	.splice_write	= gfs2_file_splice_write,

	.setlease	= generic_setlease,

	.fallocate	= gfs2_fallocate,

fs/gfs2/glock.c

+9 −2
Original line number Diff line number Diff line
@@ -218,7 +218,7 @@ static void gfs2_holder_wake(struct gfs2_holder *gh) 
 *

 */



static inline void do_error(struct gfs2_glock *gl, const int ret)

static void do_error(struct gfs2_glock *gl, const int ret)

{

	struct gfs2_holder *gh, *tmp;
@@ -475,7 +475,14 @@ __acquires(&gl->gl_lockref.lock) 
	if (sdp->sd_lockstruct.ls_ops->lm_lock)	{

		/* lock_dlm */

		ret = sdp->sd_lockstruct.ls_ops->lm_lock(gl, target, lck_flags);

		if (ret) {

		if (ret == -EINVAL && gl->gl_target == LM_ST_UNLOCKED &&

		    target == LM_ST_UNLOCKED &&

		    test_bit(SDF_SKIP_DLM_UNLOCK, &sdp->sd_flags)) {

			finish_xmote(gl, target);

			if (queue_delayed_work(glock_workqueue, &gl->gl_work, 0) == 0)

				gfs2_glock_put(gl);

		}

		else if (ret) {

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

			GLOCK_BUG_ON(gl, 1);

		}

fs/gfs2/glops.c

+0 −7
Original line number Diff line number Diff line
@@ -286,17 +286,10 @@ static void inode_go_inval(struct gfs2_glock *gl, int flags) 
static int inode_go_demote_ok(const struct gfs2_glock *gl)

{

	struct gfs2_sbd *sdp = gl->gl_name.ln_sbd;

	struct gfs2_holder *gh;



	if (sdp->sd_jindex == gl->gl_object || sdp->sd_rindex == gl->gl_object)

		return 0;



	if (!list_empty(&gl->gl_holders)) {

		gh = list_entry(gl->gl_holders.next, struct gfs2_holder, gh_list);

		if (gh->gh_list.next != &gl->gl_holders)

			return 0;

	}



	return 1;

}

fs/gfs2/inode.c

+3 −3
Original line number Diff line number Diff line
@@ -93,12 +93,12 @@ struct inode *gfs2_inode_lookup(struct super_block *sb, unsigned int type, 
	int error;



	inode = iget_locked(sb, (unsigned long)no_addr);

	ip = GFS2_I(inode);

	ip->i_no_addr = no_addr;



	if (!inode)

		return ERR_PTR(-ENOMEM);



	ip = GFS2_I(inode);

	ip->i_no_addr = no_addr;



	if (inode->i_state & I_NEW) {

		struct gfs2_sbd *sdp = GFS2_SB(inode);

		ip->i_no_formal_ino = no_formal_ino;