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

Commit b403f230 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 ten patches this time, half of which are related to a
  plethora of nasty outcomes when inodes are transitioned from the
  unlinked state to the free state.  Small file systems are particularly
  vulnerable to these problems, and it can manifest as mainly hangs, but
  also file system corruption.  The patches have been tested for
  literally many weeks, with a very gruelling test, so I have a high
  level of confidence.

   - Andreas Gruenbacher wrote a series of five patches for various
     lockups during the transition of inodes from unlinked to free.

     The main patch is titled "Fix gfs2_lookup_by_inum lock inversion"
     and the other four are support and cleanup patches related to that.

   - Ben Marzinski contributed two patches with regard to a recreatable
     problem when gfs2 tries to write a page to a file that is being
     truncated, resulting in a BUG() in gfs2_remove_from_journal.

     Note that Ben had to export vfs function __block_write_full_page to
     get this to work properly.  It's been posted a long time and he
     talked to various VFS people about it, and nobody seemed to mind.

   - I contributed 3 patches:
       o The first one fixes a memory corruptor: a race in which one
         process can overwrite the gl_object pointer set by another
         process, causing kernel panic and other symptoms.
       o The second patch fixes another race that resulted in a
         false-positive BUG_ON.  This occurred when resource group
         reservations were freed by one process while another process
         was trying to grab a new reservation in the same resource
         group.
       o The third patch fixes a problem with doing journal replay when
         the journals are not all the same size"

* tag 'gfs2-4.7.fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2:
  GFS2: Fix gfs2_replay_incr_blk for multiple journal sizes
  GFS2: Check rs_free with rd_rsspin protection
  gfs2: writeout truncated pages
  fs: export __block_write_full_page
  gfs2: Lock holder cleanup
  gfs2: Large-filesystem fix for 32-bit systems
  gfs2: Get rid of gfs2_ilookup
  gfs2: Fix gfs2_lookup_by_inum lock inversion
  gfs2: Initialize iopen glock holder for new inodes
  GFS2: don't set rgrp gl_object until it's inserted into rgrp tree
parents 523d939e e1cb6be9

fs/buffer.c

+2 −1
Original line number Diff line number Diff line
@@ -1687,7 +1687,7 @@ static struct buffer_head *create_page_buffers(struct page *page, struct inode * 
 * WB_SYNC_ALL, the writes are posted using WRITE_SYNC; this

 * causes the writes to be flagged as synchronous writes.

 */

static int __block_write_full_page(struct inode *inode, struct page *page,

int __block_write_full_page(struct inode *inode, struct page *page,

			get_block_t *get_block, struct writeback_control *wbc,

			bh_end_io_t *handler)

{
@@ -1848,6 +1848,7 @@ static int __block_write_full_page(struct inode *inode, struct page *page, 
	unlock_page(page);

	goto done;

}

EXPORT_SYMBOL(__block_write_full_page);



/*

 * If a page has any new buffers, zero them out here, and mark them uptodate

fs/gfs2/aops.c

+34 −15
Original line number Diff line number Diff line
@@ -140,6 +140,32 @@ static int gfs2_writepage(struct page *page, struct writeback_control *wbc) 
	return nobh_writepage(page, gfs2_get_block_noalloc, wbc);

}



/* This is the same as calling block_write_full_page, but it also

 * writes pages outside of i_size

 */

int gfs2_write_full_page(struct page *page, get_block_t *get_block,

			 struct writeback_control *wbc)

{

	struct inode * const inode = page->mapping->host;

	loff_t i_size = i_size_read(inode);

	const pgoff_t end_index = i_size >> PAGE_SHIFT;

	unsigned offset;



	/*

	 * The page straddles i_size.  It must be zeroed out on each and every

	 * writepage invocation because it may be mmapped.  "A file is mapped

	 * in multiples of the page size.  For a file that is not a multiple of

	 * the  page size, the remaining memory is zeroed when mapped, and

	 * writes to that region are not written out to the file."

	 */

	offset = i_size & (PAGE_SIZE-1);

	if (page->index == end_index && offset)

		zero_user_segment(page, offset, PAGE_SIZE);



	return __block_write_full_page(inode, page, get_block, wbc,

				       end_buffer_async_write);

}



/**

 * __gfs2_jdata_writepage - The core of jdata writepage

 * @page: The page to write
@@ -165,7 +191,7 @@ static int __gfs2_jdata_writepage(struct page *page, struct writeback_control *w 
		}

		gfs2_page_add_databufs(ip, page, 0, sdp->sd_vfs->s_blocksize-1);

	}

	return block_write_full_page(page, gfs2_get_block_noalloc, wbc);

	return gfs2_write_full_page(page, gfs2_get_block_noalloc, wbc);

}



/**
@@ -180,27 +206,20 @@ static int __gfs2_jdata_writepage(struct page *page, struct writeback_control *w 
static int gfs2_jdata_writepage(struct page *page, struct writeback_control *wbc)

{

	struct inode *inode = page->mapping->host;

	struct gfs2_inode *ip = GFS2_I(inode);

	struct gfs2_sbd *sdp = GFS2_SB(inode);

	int ret;

	int done_trans = 0;



	if (PageChecked(page)) {

		if (wbc->sync_mode != WB_SYNC_ALL)

			goto out_ignore;

		ret = gfs2_trans_begin(sdp, RES_DINODE + 1, 0);

		if (ret)

	if (gfs2_assert_withdraw(sdp, gfs2_glock_is_held_excl(ip->i_gl)))

		goto out;

	if (PageChecked(page) || current->journal_info)

		goto out_ignore;

		done_trans = 1;

	}

	ret = gfs2_writepage_common(page, wbc);

	if (ret > 0)

	ret = __gfs2_jdata_writepage(page, wbc);

	if (done_trans)

		gfs2_trans_end(sdp);

	return ret;



out_ignore:

	redirty_page_for_writepage(wbc, page);

out:

	unlock_page(page);

	return 0;

}

fs/gfs2/dentry.c

+1 −1
Original line number Diff line number Diff line
@@ -117,7 +117,7 @@ static int gfs2_dentry_delete(const struct dentry *dentry) 
		return 0;



	ginode = GFS2_I(d_inode(dentry));

	if (!ginode->i_iopen_gh.gh_gl)

	if (!gfs2_holder_initialized(&ginode->i_iopen_gh))

		return 0;



	if (test_bit(GLF_DEMOTE, &ginode->i_iopen_gh.gh_gl->gl_flags))

fs/gfs2/dir.c

+2 −1
Original line number Diff line number Diff line
@@ -1663,7 +1663,8 @@ 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);

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

					  GFS2_BLKST_FREE /* ignore */);

		if (!IS_ERR(inode))

			GFS2_I(inode)->i_rahead = rahead;

		return inode;

fs/gfs2/export.c

+0 −11
Original line number Diff line number Diff line
@@ -137,21 +137,10 @@ 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);

	if (inode) {

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

			iput(inode);

			return ERR_PTR(-ESTALE);

		}

		goto out_inode;

	}



	inode = gfs2_lookup_by_inum(sdp, inum->no_addr, &inum->no_formal_ino,

				    GFS2_BLKST_DINODE);

	if (IS_ERR(inode))

		return ERR_CAST(inode);



out_inode:

	return d_obtain_alias(inode);

}