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

Commit 1ca80a0a authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'gfs2-merge-window' of git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2 

Pull GFS2 updates from Bob Peterson:
 "We only have six patches ready for this merge window:

   - Arnd Bergmann contributed a patch that fixes an uninitialized
     variable warning.

   - The second patch avoids a kernel panic due to referencing an iopen
     glock that may not be held, in an error path.

   - The third patch fixes a rounding error that caused xfs_tests direct
     IO write "fsx" tests to fail on GFS2.

   - The fourth patch tidies up the code path when glocks are being
     reused to recreate a dinode that was recently deleted.

   - The fifth reverts an ages-old patch that should no longer be
     needed, and which interfered with the transition of dinodes from
     unlinked to free.

   - And lastly, a patch to eliminate a function parameter that's not
     needed"

* tag 'gfs2-merge-window' of git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2:
  GFS2: Eliminate parameter non_block on gfs2_inode_lookup
  GFS2: Don't filter out I_FREEING inodes anymore
  GFS2: Prevent delete work from occurring on glocks used for create
  GFS2: Fix direct IO write rounding error
  gfs2: avoid uninitialized variable warning
  GFS2: Check if iopen is held when deleting inode
parents d77bed0d 73b462d2

fs/gfs2/aops.c

+1 −1
Original line number Diff line number Diff line
@@ -1082,7 +1082,7 @@ static ssize_t gfs2_direct_IO(struct kiocb *iocb, struct iov_iter *iter, 
	 * the first place, mapping->nr_pages will always be zero.

	 */

	if (mapping->nrpages) {

		loff_t lstart = offset & (PAGE_CACHE_SIZE - 1);

		loff_t lstart = offset & ~(PAGE_CACHE_SIZE - 1);

		loff_t len = iov_iter_count(iter);

		loff_t end = PAGE_ALIGN(offset + len) - 1;

fs/gfs2/dir.c

+3 −3
Original line number Diff line number Diff line
@@ -798,7 +798,7 @@ static int get_first_leaf(struct gfs2_inode *dip, u32 index, 
	int error;



	error = get_leaf_nr(dip, index, &leaf_no);

	if (!error)

	if (!IS_ERR_VALUE(error))

		error = get_leaf(dip, leaf_no, bh_out);



	return error;
@@ -1014,7 +1014,7 @@ static int dir_split_leaf(struct inode *inode, const struct qstr *name) 


	index = name->hash >> (32 - dip->i_depth);

	error = get_leaf_nr(dip, index, &leaf_no);

	if (error)

	if (IS_ERR_VALUE(error))

		return error;



	/*  Get the old leaf block  */
@@ -1660,7 +1660,7 @@ struct inode *gfs2_dir_search(struct inode *dir, const struct qstr *name, 
		brelse(bh);

		if (fail_on_exist)

			return ERR_PTR(-EEXIST);

		inode = gfs2_inode_lookup(dir->i_sb, dtype, addr, formal_ino, 0);

		inode = gfs2_inode_lookup(dir->i_sb, dtype, addr, formal_ino);

		if (!IS_ERR(inode))

			GFS2_I(inode)->i_rahead = rahead;

		return inode;

fs/gfs2/export.c

+1 −1
Original line number Diff line number Diff line
@@ -137,7 +137,7 @@ static struct dentry *gfs2_get_dentry(struct super_block *sb, 
	struct gfs2_sbd *sdp = sb->s_fs_info;

	struct inode *inode;



	inode = gfs2_ilookup(sb, inum->no_addr, 0);

	inode = gfs2_ilookup(sb, inum->no_addr);

	if (inode) {

		if (GFS2_I(inode)->i_no_formal_ino != inum->no_formal_ino) {

			iput(inode);

fs/gfs2/glock.c

+9 −1
Original line number Diff line number Diff line
@@ -572,17 +572,24 @@ static void delete_work_func(struct work_struct *work) 
	struct inode *inode;

	u64 no_addr = gl->gl_name.ln_number;



	/* If someone's using this glock to create a new dinode, the block must

	   have been freed by another node, then re-used, in which case our

	   iopen callback is too late after the fact. Ignore it. */

	if (test_bit(GLF_INODE_CREATING, &gl->gl_flags))

		goto out;



	ip = gl->gl_object;

	/* Note: Unsafe to dereference ip as we don't hold right refs/locks */



	if (ip)

		inode = gfs2_ilookup(sdp->sd_vfs, no_addr, 1);

		inode = gfs2_ilookup(sdp->sd_vfs, no_addr);

	else

		inode = gfs2_lookup_by_inum(sdp, no_addr, NULL, GFS2_BLKST_UNLINKED);

	if (inode && !IS_ERR(inode)) {

		d_prune_aliases(inode);

		iput(inode);

	}

out:

	gfs2_glock_put(gl);

}
@@ -1015,6 +1022,7 @@ void gfs2_glock_dq(struct gfs2_holder *gh) 
		handle_callback(gl, LM_ST_UNLOCKED, 0, false);



	list_del_init(&gh->gh_list);

	clear_bit(HIF_HOLDER, &gh->gh_iflags);

	if (find_first_holder(gl) == NULL) {

		if (glops->go_unlock) {

			GLOCK_BUG_ON(gl, test_and_set_bit(GLF_LOCK, &gl->gl_flags));

fs/gfs2/incore.h

+1 −0
Original line number Diff line number Diff line
@@ -328,6 +328,7 @@ enum { 
	GLF_LRU				= 13,

	GLF_OBJECT			= 14, /* Used only for tracing */

	GLF_BLOCKING			= 15,

	GLF_INODE_CREATING		= 16, /* Inode creation occurring */

};



struct gfs2_glock {