Commit 9e239bb9 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'ext4_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4 

Pull ext4 update from Ted Ts'o:
 "Lots of bug fixes, cleanups and optimizations.  In the bug fixes
  category, of note is a fix for on-line resizing file systems where the
  block size is smaller than the page size (i.e., file systems 1k blocks
  on x86, or more interestingly file systems with 4k blocks on Power or
  ia64 systems.)

  In the cleanup category, the ext4's punch hole implementation was
  significantly improved by Lukas Czerner, and now supports bigalloc
  file systems.  In addition, Jan Kara significantly cleaned up the
  write submission code path.  We also improved error checking and added
  a few sanity checks.

  In the optimizations category, two major optimizations deserve
  mention.  The first is that ext4_writepages() is now used for
  nodelalloc and ext3 compatibility mode.  This allows writes to be
  submitted much more efficiently as a single bio request, instead of
  being sent as individual 4k writes into the block layer (which then
  relied on the elevator code to coalesce the requests in the block
  queue).  Secondly, the extent cache shrink mechanism, which was
  introduce in 3.9, no longer has a scalability bottleneck caused by the
  i_es_lru spinlock.  Other optimizations include some changes to reduce
  CPU usage and to avoid issuing empty commits unnecessarily."

* tag 'ext4_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4: (86 commits)
  ext4: optimize starting extent in ext4_ext_rm_leaf()
  jbd2: invalidate handle if jbd2_journal_restart() fails
  ext4: translate flag bits to strings in tracepoints
  ext4: fix up error handling for mpage_map_and_submit_extent()
  jbd2: fix theoretical race in jbd2__journal_restart
  ext4: only zero partial blocks in ext4_zero_partial_blocks()
  ext4: check error return from ext4_write_inline_data_end()
  ext4: delete unnecessary C statements
  ext3,ext4: don't mess with dir_file->f_pos in htree_dirblock_to_tree()
  jbd2: move superblock checksum calculation to jbd2_write_superblock()
  ext4: pass inode pointer instead of file pointer to punch hole
  ext4: improve free space calculation for inline_data
  ext4: reduce object size when !CONFIG_PRINTK
  ext4: improve extent cache shrink mechanism to avoid to burn CPU time
  ext4: implement error handling of ext4_mb_new_preallocation()
  ext4: fix corruption when online resizing a fs with 1K block size
  ext4: delete unused variables
  ext4: return FIEMAP_EXTENT_UNKNOWN for delalloc extents
  jbd2: remove debug dependency on debug_fs and update Kconfig help text
  jbd2: use a single printk for jbd_debug()
  ...
parents 63580e51 6ae06ff5

Documentation/filesystems/Locking

+3 −3
Original line number Diff line number Diff line
@@ -189,7 +189,7 @@ prototypes: 
				loff_t pos, unsigned len, unsigned copied,

				struct page *page, void *fsdata);

	sector_t (*bmap)(struct address_space *, sector_t);

	int (*invalidatepage) (struct page *, unsigned long);

	void (*invalidatepage) (struct page *, unsigned int, unsigned int);

	int (*releasepage) (struct page *, int);

	void (*freepage)(struct page *);

	int (*direct_IO)(int, struct kiocb *, const struct iovec *iov,

Documentation/filesystems/vfs.txt

+10 −10
Original line number Diff line number Diff line
@@ -549,7 +549,7 @@ struct address_space_operations 
-------------------------------



This describes how the VFS can manipulate mapping of a file to page cache in

your filesystem. As of kernel 2.6.22, the following members are defined:

your filesystem. The following members are defined:



struct address_space_operations {

	int (*writepage)(struct page *page, struct writeback_control *wbc);
@@ -566,7 +566,7 @@ struct address_space_operations { 
				loff_t pos, unsigned len, unsigned copied,

				struct page *page, void *fsdata);

	sector_t (*bmap)(struct address_space *, sector_t);

	int (*invalidatepage) (struct page *, unsigned long);

	void (*invalidatepage) (struct page *, unsigned int, unsigned int);

	int (*releasepage) (struct page *, int);

	void (*freepage)(struct page *);

	ssize_t (*direct_IO)(int, struct kiocb *, const struct iovec *iov,
@@ -685,13 +685,13 @@ struct address_space_operations { 
  invalidatepage: If a page has PagePrivate set, then invalidatepage

        will be called when part or all of the page is to be removed

	from the address space.  This generally corresponds to either a

	truncation or a complete invalidation of the address space

	(in the latter case 'offset' will always be 0).

	Any private data associated with the page should be updated

	to reflect this truncation.  If offset is 0, then

	the private data should be released, because the page

	must be able to be completely discarded.  This may be done by

        calling the ->releasepage function, but in this case the

	truncation, punch hole  or a complete invalidation of the address

	space (in the latter case 'offset' will always be 0 and 'length'

	will be PAGE_CACHE_SIZE). Any private data associated with the page

	should be updated to reflect this truncation.  If offset is 0 and

	length is PAGE_CACHE_SIZE, then the private data should be released,

	because the page must be able to be completely discarded.  This may

	be done by calling the ->releasepage function, but in this case the

	release MUST succeed.



  releasepage: releasepage is called on PagePrivate pages to indicate

fs/9p/vfs_addr.c

+3 −2
Original line number Diff line number Diff line
@@ -148,13 +148,14 @@ static int v9fs_release_page(struct page *page, gfp_t gfp) 
 * @offset: offset in the page

 */



static void v9fs_invalidate_page(struct page *page, unsigned long offset)

static void v9fs_invalidate_page(struct page *page, unsigned int offset,

				 unsigned int length)

{

	/*

	 * If called with zero offset, we should release

	 * the private state assocated with the page

	 */

	if (offset == 0)

	if (offset == 0 && length == PAGE_CACHE_SIZE)

		v9fs_fscache_invalidate_page(page);

}

fs/afs/file.c

+6 −4
Original line number Diff line number Diff line
@@ -19,7 +19,8 @@ 
#include "internal.h"



static int afs_readpage(struct file *file, struct page *page);

static void afs_invalidatepage(struct page *page, unsigned long offset);

static void afs_invalidatepage(struct page *page, unsigned int offset,

			       unsigned int length);

static int afs_releasepage(struct page *page, gfp_t gfp_flags);

static int afs_launder_page(struct page *page);
@@ -310,16 +311,17 @@ static int afs_launder_page(struct page *page) 
 * - release a page and clean up its private data if offset is 0 (indicating

 *   the entire page)

 */

static void afs_invalidatepage(struct page *page, unsigned long offset)

static void afs_invalidatepage(struct page *page, unsigned int offset,

			       unsigned int length)

{

	struct afs_writeback *wb = (struct afs_writeback *) page_private(page);



	_enter("{%lu},%lu", page->index, offset);

	_enter("{%lu},%u,%u", page->index, offset, length);



	BUG_ON(!PageLocked(page));



	/* we clean up only if the entire page is being invalidated */

	if (offset == 0) {

	if (offset == 0 && length == PAGE_CACHE_SIZE) {

#ifdef CONFIG_AFS_FSCACHE

		if (PageFsCache(page)) {

			struct afs_vnode *vnode = AFS_FS_I(page->mapping->host);

fs/btrfs/disk-io.c

+2 −1
Original line number Diff line number Diff line
@@ -1013,7 +1013,8 @@ static int btree_releasepage(struct page *page, gfp_t gfp_flags) 
	return try_release_extent_buffer(page);

}



static void btree_invalidatepage(struct page *page, unsigned long offset)

static void btree_invalidatepage(struct page *page, unsigned int offset,

				 unsigned int length)

{

	struct extent_io_tree *tree;

	tree = &BTRFS_I(page->mapping->host)->io_tree;

CRA Git | Maintained and supported by SUSTech CRA and CCSE