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

Commit 26064ea4 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull GFS2 updates from Bob Peterson:
 "We've got 30 patches for this merge window. These generally fall into
  five categories:

   - code cleanups

   - patches related to adding PUNCH_HOLE support to GFS2

   - support for new fields in resource group headers

   - a few bug fixes

   - support for new fields in journal log headers. These new fields,
     which were previously unused, are designed to make it easier to
     track down file system corruption, and allow fsck.gfs2 to make more
     intelligent decisions when finding and fixing file system
     corruption.

  Details:

   - Two patches from Abhi Das, to trim the ordered writes list, which
     used to grow uncontrollably until unmount.

   - Several patches from Andreas Gruenbacher: remove an unused
     parameter from function gfs2_write_jdata_pagevec, remove a
     pointless BUG_ON, clean up an error patch in trunc_start, remove
     some unused parameters from truncate, make gfs2_journaled_truncate
     more efficient, clean up the support functions for truncate, fix
     metadata read-ahead for truncate to make it faster, fix up the
     non-recursive truncate code, rework and rename
     gfs2_block_truncate_page, generalize the non-recursive truncate
     code so it can take a range of values for punch_hole support,
     introduce new PUNCH_HOLE support that take advantage of the
     previous patches, add fallocate support with PUNCH_HOLE, fix some
     typos in the comments, add the function gfs2_max_stuffed_size to
     replace a piece of code that was needlessly repeated throughout
     GFS2, a minor cleanup to function gfs2_page_add_databufs, get rid
     of function gfs2_log_header_in in preparation for the new log
     header fields, and also fix up some missing newlines in kernel
     messages.

   - Andy Price added a new field to resource groups to indicate where
     the next one should be, to allow fsck.gfs2 to make better repairs.
     He also added new rindex fields for consistency checking, and added
     a crc field to resource group headers for consistency checking.

   - I reduced redundancy in functions common to freeing dinodes, and
     when writing log headers between the journalling code and journal
     recovery code. Also added new fields to journal log headers based
     on a prototype from Steve Whitehouse, and log the source of journal
     log headers so we can better track down journal corruption. Minor
     comment typo fix and a fix for a BUG in an unlink error path.

   - Steve Whitehouse contributed a patch to fix an incorrect use of the
     gfs2_blk2rgrpd function.

   - Tetsuo Handa contributed a patch that fixes incorrect error
     handling in function init_gfs2_fs"

* tag 'gfs2-4.16.fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2: (30 commits)
  gfs2: Add a few missing newlines in messages
  gfs2: Remove inode from ordered write list in gfs2_write_inode()
  GFS2: Don't try to end a non-existent transaction in unlink
  GFS2: Fix minor comment typo
  GFS2: Log the reason for log flushes in every log header
  GFS2: Introduce new gfs2_log_header_v2
  gfs2: Get rid of gfs2_log_header_in
  gfs2: Minor gfs2_page_add_databufs cleanup
  gfs2: Add gfs2_max_stuffed_size
  gfs2: Typo fixes
  gfs2: Implement fallocate(FALLOC_FL_PUNCH_HOLE)
  gfs2: Turn trunc_dealloc into punch_hole
  gfs2: Generalize truncate code
  Turn gfs2_block_truncate_page into gfs2_block_zero_range
  gfs2: Improve non-recursive delete algorithm
  gfs2: Fix metadata read-ahead during truncate
  gfs2: Clean up {lookup,fillup}_metapath
  gfs2: Remove minor gfs2_journaled_truncate inefficiencies
  gfs2: truncate: Remove unnecessary oldsize parameters
  gfs2: Clean up trunc_start error path
  ...
parents c9cc8d01 af38816e

fs/gfs2/Kconfig

+2 −0
Original line number Diff line number Diff line
@@ -3,6 +3,8 @@ config GFS2_FS 
	depends on (64BIT || LBDAF)

	select FS_POSIX_ACL

	select CRC32

	select CRYPTO

	select CRYPTO_CRC32C

	select QUOTACTL

	select FS_IOMAP

	help

fs/gfs2/aops.c

+18 −17
Original line number Diff line number Diff line
@@ -39,18 +39,21 @@ 




static void gfs2_page_add_databufs(struct gfs2_inode *ip, struct page *page,

				   unsigned int from, unsigned int to)

				   unsigned int from, unsigned int len)

{

	struct buffer_head *head = page_buffers(page);

	unsigned int bsize = head->b_size;

	struct buffer_head *bh;

	unsigned int to = from + len;

	unsigned int start, end;



	for (bh = head, start = 0; bh != head || !start;

	     bh = bh->b_this_page, start = end) {

		end = start + bsize;

		if (end <= from || start >= to)

		if (end <= from)

			continue;

		if (start >= to)

			break;

		if (gfs2_is_jdata(ip))

			set_buffer_uptodate(bh);

		gfs2_trans_add_data(ip->i_gl, bh);
@@ -189,7 +192,7 @@ static int __gfs2_jdata_writepage(struct page *page, struct writeback_control *w 
			create_empty_buffers(page, inode->i_sb->s_blocksize,

					     BIT(BH_Dirty)|BIT(BH_Uptodate));

		}

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

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

	}

	return gfs2_write_full_page(page, gfs2_get_block_noalloc, wbc);

}
@@ -255,7 +258,6 @@ static int gfs2_writepages(struct address_space *mapping, 
 * @wbc: The writeback control

 * @pvec: The vector of pages

 * @nr_pages: The number of pages to write

 * @end: End position

 * @done_index: Page index

 *

 * Returns: non-zero if loop should terminate, zero otherwise
@@ -264,7 +266,7 @@ static int gfs2_writepages(struct address_space *mapping, 
static int gfs2_write_jdata_pagevec(struct address_space *mapping,

				    struct writeback_control *wbc,

				    struct pagevec *pvec,

				    int nr_pages, pgoff_t end,

				    int nr_pages,

				    pgoff_t *done_index)

{

	struct inode *inode = mapping->host;
@@ -402,7 +404,7 @@ static int gfs2_write_cache_jdata(struct address_space *mapping, 
		if (nr_pages == 0)

			break;



		ret = gfs2_write_jdata_pagevec(mapping, wbc, &pvec, nr_pages, end, &done_index);

		ret = gfs2_write_jdata_pagevec(mapping, wbc, &pvec, nr_pages, &done_index);

		if (ret)

			done = 1;

		if (ret > 0)
@@ -446,7 +448,8 @@ static int gfs2_jdata_writepages(struct address_space *mapping, 


	ret = gfs2_write_cache_jdata(mapping, wbc);

	if (ret == 0 && wbc->sync_mode == WB_SYNC_ALL) {

		gfs2_log_flush(sdp, ip->i_gl, NORMAL_FLUSH);

		gfs2_log_flush(sdp, ip->i_gl, GFS2_LOG_HEAD_FLUSH_NORMAL |

			       GFS2_LFC_JDATA_WPAGES);

		ret = gfs2_write_cache_jdata(mapping, wbc);

	}

	return ret;
@@ -483,8 +486,8 @@ static int stuffed_readpage(struct gfs2_inode *ip, struct page *page) 
		return error;



	kaddr = kmap_atomic(page);

	if (dsize > (dibh->b_size - sizeof(struct gfs2_dinode)))

		dsize = (dibh->b_size - sizeof(struct gfs2_dinode));

	if (dsize > gfs2_max_stuffed_size(ip))

		dsize = gfs2_max_stuffed_size(ip);

	memcpy(kaddr, dibh->b_data + sizeof(struct gfs2_dinode), dsize);

	memset(kaddr + dsize, 0, PAGE_SIZE - dsize);

	kunmap_atomic(kaddr);
@@ -501,10 +504,9 @@ static int stuffed_readpage(struct gfs2_inode *ip, struct page *page) 
 * @file: The file to read a page for

 * @page: The page to read

 *

 * This is the core of gfs2's readpage. Its used by the internal file

 * reading code as in that case we already hold the glock. Also its

 * This is the core of gfs2's readpage. It's used by the internal file

 * reading code as in that case we already hold the glock. Also it's

 * called by gfs2_readpage() once the required lock has been granted.

 *

 */



static int __gfs2_readpage(void *file, struct page *page)
@@ -725,7 +727,7 @@ static int gfs2_write_begin(struct file *file, struct address_space *mapping, 


	if (gfs2_is_stuffed(ip)) {

		error = 0;

		if (pos + len > sdp->sd_sb.sb_bsize - sizeof(struct gfs2_dinode)) {

		if (pos + len > gfs2_max_stuffed_size(ip)) {

			error = gfs2_unstuff_dinode(ip, page);

			if (error == 0)

				goto prepare_write;
@@ -832,7 +834,8 @@ static int gfs2_stuffed_write_end(struct inode *inode, struct buffer_head *dibh, 
	void *kaddr;

	unsigned char *buf = dibh->b_data + sizeof(struct gfs2_dinode);



	BUG_ON((pos + len) > (dibh->b_size - sizeof(struct gfs2_dinode)));

	BUG_ON(pos + len > gfs2_max_stuffed_size(ip));



	kaddr = kmap_atomic(page);

	memcpy(buf + pos, kaddr + pos, copied);

	flush_dcache_page(page);
@@ -890,8 +893,6 @@ static int gfs2_write_end(struct file *file, struct address_space *mapping, 
	struct gfs2_sbd *sdp = GFS2_SB(inode);

	struct gfs2_inode *m_ip = GFS2_I(sdp->sd_statfs_inode);

	struct buffer_head *dibh;

	unsigned int from = pos & (PAGE_SIZE - 1);

	unsigned int to = from + len;

	int ret;

	struct gfs2_trans *tr = current->journal_info;

	BUG_ON(!tr);
@@ -909,7 +910,7 @@ static int gfs2_write_end(struct file *file, struct address_space *mapping, 
		return gfs2_stuffed_write_end(inode, dibh, pos, len, copied, page);



	if (!gfs2_is_writeback(ip))

		gfs2_page_add_databufs(ip, page, from, to);

		gfs2_page_add_databufs(ip, page, pos & ~PAGE_MASK, len);



	ret = generic_write_end(file, mapping, pos, len, copied, page, fsdata);

	if (tr->tr_num_buf_new)

fs/gfs2/bmap.c

+401 −182

File changed.

Preview size limit exceeded, changes collapsed.

fs/gfs2/bmap.h

+1 −0
Original line number Diff line number Diff line
@@ -61,5 +61,6 @@ extern int gfs2_write_alloc_required(struct gfs2_inode *ip, u64 offset, 
				     unsigned int len);

extern int gfs2_map_journal_extents(struct gfs2_sbd *sdp, struct gfs2_jdesc *jd);

extern void gfs2_free_journal_extents(struct gfs2_jdesc *jd);

extern int __gfs2_punch_hole(struct file *file, loff_t offset, loff_t length);



#endif /* __BMAP_DOT_H__ */

fs/gfs2/dir.c

+1 −2
Original line number Diff line number Diff line
@@ -170,8 +170,7 @@ static int gfs2_dir_write_data(struct gfs2_inode *ip, const char *buf, 
	if (!size)

		return 0;



	if (gfs2_is_stuffed(ip) &&

	    offset + size <= sdp->sd_sb.sb_bsize - sizeof(struct gfs2_dinode))

	if (gfs2_is_stuffed(ip) && offset + size <= gfs2_max_stuffed_size(ip))

		return gfs2_dir_write_stuffed(ip, buf, (unsigned int)offset,

					      size);