Patchwork [GIT,PULL] ext4 updates for 3.11

login
register
mail settings
Submitter Theodore Ts'o
Date July 1, 2013, 1:55 p.m.
Message ID <nsxbo6mxu38.fsf@lambda.thunk.org>
Download mbox
Permalink /patch/256144/
State New
Headers show

Pull-request

git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4.git tags/ext4_for_linus

Comments

Theodore Ts'o - July 1, 2013, 1:55 p.m.
The following changes since commit c7788792a5e7b0d5d7f96d0766b4cb6112d47d75:

  Linux 3.10-rc2 (2013-05-20 14:37:38 -0700)

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4.git tags/ext4_for_linus

for you to fetch changes up to 6ae06ff51eab5dcbbf959b05ce0f11003a305ba5:

  ext4: optimize starting extent in ext4_ext_rm_leaf() (2013-07-01 08:12:41 -0400)

----------------------------------------------------------------
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.

----------------------------------------------------------------
Al Viro (1):
      ext3,ext4: don't mess with dir_file->f_pos in htree_dirblock_to_tree()

Alexey Khoroshilov (1):
      ext4: implement error handling of ext4_mb_new_preallocation()

Ashish Sangwan (2):
      ext4: pass inode pointer instead of file pointer to punch hole
      ext4: optimize starting extent in ext4_ext_rm_leaf()

Darrick J. Wong (1):
      jbd2: fix block tag checksum verification brokenness

Dmitry Monakhov (3):
      jbd2: optimize jbd2_journal_force_commit
      ext4: fix data integrity for ext4_sync_fs
      ext4: Fix fsync error handling after filesystem abort

Jan Kara (30):
      ext4: fix data offset overflow on 32-bit archs in ext4_inline_data_fiemap()
      ext4: fix overflows in SEEK_HOLE, SEEK_DATA implementations
      ext4: fix data offset overflow in ext4_xattr_fiemap() on 32-bit archs
      ext4: fix overflow when counting used blocks on 32-bit architectures
      ext4: use io_end for multiple bios
      jbd2: don't create journal_head for temporary journal buffers
      jbd2: remove journal_head from descriptor buffers
      jbd2: refine waiting for shadow buffers
      jbd2: remove outdated comment
      jbd2: cleanup needed free block estimates when starting a transaction
      jbd2: fix race in t_outstanding_credits update in jbd2_journal_extend()
      jbd2: remove unused waitqueues
      jbd2: transaction reservation support
      ext4: provide wrappers for transaction reservation calls
      ext4: stop messing with nr_to_write in ext4_da_writepages()
      ext4: deprecate max_writeback_mb_bump sysfs attribute
      ext4: improve writepage credit estimate for files with indirect blocks
      ext4: better estimate credits needed for ext4_da_writepages()
      ext4: restructure writeback path
      ext4: remove buffer_uninit handling
      ext4: use transaction reservation for extent conversion in ext4_end_io
      ext4: split extent conversion lists to reserved & unreserved parts
      ext4: defer clearing of PageWriteback after extent conversion
      ext4: protect extent conversion after DIO with i_dio_count
      ext4: remove wait for unwritten extent conversion from ext4_truncate()
      ext4: use generic_file_fsync() in ext4_file_fsync() in nojournal mode
      ext4: remove i_mutex from ext4_file_sync()
      ext4: Remove wait for unwritten extents in ext4_ind_direct_IO()
      ext4: don't wait for extent conversion in ext4_punch_hole()
      ext4: remove ext4_ioend_wait()

Jie Liu (1):
      ext4: return FIEMAP_EXTENT_UNKNOWN for delalloc extents

Joe Perches (1):
      ext4: reduce object size when !CONFIG_PRINTK

Jon Ernst (1):
      ext4: delete unused variables

Lukas Czerner (20):
      mm: change invalidatepage prototype to accept length
      jbd2: change jbd2_journal_invalidatepage to accept length
      ext4: use ->invalidatepage() length argument
      jbd: change journal_invalidatepage() to accept length
      xfs: use ->invalidatepage() length argument
      ocfs2: use ->invalidatepage() length argument
      ceph: use ->invalidatepage() length argument
      gfs2: use ->invalidatepage() length argument
      reiserfs: use ->invalidatepage() length argument
      mm: teach truncate_inode_pages_range() to handle non page aligned ranges
      Revert "ext4: remove no longer used functions in inode.c"
      ext4: Call ext4_jbd2_file_inode() after zeroing block
      Revert "ext4: fix fsx truncate failure"
      ext4: truncate_inode_pages() in orphan cleanup path
      ext4: use ext4_zero_partial_blocks in punch_hole
      ext4: remove unused discard_partial_page_buffers
      ext4: remove unused code from ext4_remove_blocks()
      ext4: update ext4_ext_remove_space trace point
      ext4: make punch hole code path work with bigalloc
      ext4: only zero partial blocks in ext4_zero_partial_blocks()

Maarten ter Huurne (1):
      ext4: fix corruption when online resizing a fs with 1K block size

Paul Gortmaker (6):
      jbd2: relocate assert after state lock in journal_commit_transaction()
      jbd2: drop checkpoint mutex when waiting in __jbd2_log_wait_for_space()
      jbd2: fix duplicate debug label for phase 2
      jbd/jbd2: relocate bit_spinlock header to jbd_common
      jbd2: use a single printk for jbd_debug()
      jbd2: remove debug dependency on debug_fs and update Kconfig help text

Paul Taysom (1):
      ext4: suppress ext4 orphan messages on mount

Theodore Ts'o (13):
      ext4: add check to io_submit_init_bio
      ext4: verify group number in verify_group_input() before using it
      ext4: add sanity check to ext4_get_group_info()
      ext4: optimize test_root()
      ext4: use ext4_da_writepages() for all modes
      ext4: add cond_resched() to ext4_free_blocks() & ext4_mb_regular_allocator()
      ext4: don't use EXT4_FREE_BLOCKS_FORGET unnecessarily
      jbd2: move superblock checksum calculation to jbd2_write_superblock()
      ext4: check error return from ext4_write_inline_data_end()
      jbd2: fix theoretical race in jbd2__journal_restart
      ext4: fix up error handling for mpage_map_and_submit_extent()
      ext4: translate flag bits to strings in tracepoints
      jbd2: invalidate handle if jbd2_journal_restart() fails

Zheng Liu (2):
      jbd2: use kmem_cache_zalloc for allocating journal head
      ext4: improve extent cache shrink mechanism to avoid to burn CPU time

boxi liu (1):
      ext4: improve free space calculation for inline_data

jon ernst (1):
      ext4: delete unnecessary C statements

 Documentation/filesystems/Locking |    6 +-
 Documentation/filesystems/vfs.txt |   20 +-
 fs/9p/vfs_addr.c                  |    5 +-
 fs/afs/file.c                     |   10 +-
 fs/btrfs/disk-io.c                |    3 +-
 fs/btrfs/extent_io.c              |    2 +-
 fs/btrfs/inode.c                  |    3 +-
 fs/buffer.c                       |   21 +-
 fs/ceph/addr.c                    |   15 +-
 fs/cifs/file.c                    |    5 +-
 fs/exofs/inode.c                  |    6 +-
 fs/ext3/inode.c                   |    9 +-
 fs/ext3/namei.c                   |    7 +-
 fs/ext4/balloc.c                  |   14 +-
 fs/ext4/ext4.h                    |  187 ++++---
 fs/ext4/ext4_jbd2.c               |   58 ++-
 fs/ext4/ext4_jbd2.h               |   29 +-
 fs/ext4/extents.c                 |  193 +++++---
 fs/ext4/extents_status.c          |   75 ++-
 fs/ext4/extents_status.h          |    5 +-
 fs/ext4/file.c                    |   14 +-
 fs/ext4/fsync.c                   |   52 +-
 fs/ext4/ialloc.c                  |    3 +-
 fs/ext4/indirect.c                |   40 +-
 fs/ext4/inline.c                  |    4 +-
 fs/ext4/inode.c                   | 1775 ++++++++++++++++++++++++++++++------------------------------------
 fs/ext4/mballoc.c                 |   21 +-
 fs/ext4/move_extent.c             |    3 -
 fs/ext4/namei.c                   |    7 +-
 fs/ext4/page-io.c                 |  325 ++++++------
 fs/ext4/resize.c                  |   24 +-
 fs/ext4/super.c                   |  155 ++++--
 fs/f2fs/data.c                    |    3 +-
 fs/f2fs/node.c                    |    3 +-
 fs/gfs2/aops.c                    |   17 +-
 fs/jbd/transaction.c              |   19 +-
 fs/jbd2/Kconfig                   |    6 +-
 fs/jbd2/checkpoint.c              |   22 +-
 fs/jbd2/commit.c                  |  184 +++----
 fs/jbd2/journal.c                 |  166 ++++---
 fs/jbd2/recovery.c                |   11 +-
 fs/jbd2/revoke.c                  |   49 +-
 fs/jbd2/transaction.c             |  526 ++++++++++++--------
 fs/jfs/jfs_metapage.c             |    5 +-
 fs/logfs/file.c                   |    3 +-
 fs/logfs/segment.c                |    3 +-
 fs/nfs/file.c                     |    8 +-
 fs/ntfs/aops.c                    |    2 +-
 fs/ocfs2/aops.c                   |    5 +-
 fs/reiserfs/inode.c               |   12 +-
 fs/ubifs/file.c                   |    5 +-
 fs/xfs/xfs_aops.c                 |   14 +-
 fs/xfs/xfs_trace.h                |   15 +-
 include/linux/buffer_head.h       |    3 +-
 include/linux/fs.h                |    2 +-
 include/linux/jbd.h               |   28 +-
 include/linux/jbd2.h              |  175 ++++---
 include/linux/jbd_common.h        |   26 +-
 include/linux/mm.h                |    3 +-
 include/trace/events/ext3.h       |   12 +-
 include/trace/events/ext4.h       |  304 ++++++++----
 mm/readahead.c                    |    2 +-
 mm/truncate.c                     |  117 +++--
 63 files changed, 2664 insertions(+), 2182 deletions(-)
--
To unsubscribe from this list: send the line "unsubscribe linux-ext4" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Linus Torvalds - July 2, 2013, 5:18 p.m.
Hmm I'm getting this compiler warning:

  fs/ext4/inode.c: In function ‘ext4_writepages’:
  fs/ext4/inode.c:2219:6: warning: ‘err’ may be used uninitialized in
this function [-Wmaybe-uninitialized]

and I think the compiler is right to warn. The 'err' variable is set
inside a whilte() and an if() statement, and it is not at all obvious
that those codepaths are always taken.

Maybe that "map->m_len" is always guaranteed to be nonzero, and the
"while()" statement could be a "do { } while()" one. But if so, make
it so, don't write code as if it might never be executed, when the
return value seems to *depend* on it being executed.

Or just initialize the variable correctly.

This warning may not be new to this pull, I just happened to notice it now.

                Linus
--
To unsubscribe from this list: send the line "unsubscribe linux-ext4" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Jan Kara - July 2, 2013, 6:04 p.m.
On Tue 02-07-13 10:18:32, Linus Torvalds wrote:
> Hmm I'm getting this compiler warning:
> 
>   fs/ext4/inode.c: In function ‘ext4_writepages’:
>   fs/ext4/inode.c:2219:6: warning: ‘err’ may be used uninitialized in
> this function [-Wmaybe-uninitialized]
> 
> and I think the compiler is right to warn. The 'err' variable is set
> inside a whilte() and an if() statement, and it is not at all obvious
> that those codepaths are always taken.
> 
> Maybe that "map->m_len" is always guaranteed to be nonzero, and the
> "while()" statement could be a "do { } while()" one. But if so, make
> it so, don't write code as if it might never be executed, when the
> return value seems to *depend* on it being executed.
  That's caused by my patches (only for certain gcc versions). map->m_len
is guaranteed to be > 0 in the first iteration (the function is called from
under if (map->m_len > 0)). I though Ted silenced that warning but
apparently he did not. The cleanest fix is likely to make a do-while loop
from that one. I'll send Ted a patch for that.

								Honza
Stephen Rothwell - July 2, 2013, 11:41 p.m.
On Tue, 2 Jul 2013 20:04:47 +0200 Jan Kara <jack@suse.cz> wrote:
>
> On Tue 02-07-13 10:18:32, Linus Torvalds wrote:
> > Hmm I'm getting this compiler warning:
> > 
> >   fs/ext4/inode.c: In function ‘ext4_writepages’:
> >   fs/ext4/inode.c:2219:6: warning: ‘err’ may be used uninitialized in
> > this function [-Wmaybe-uninitialized]
> > 
> > and I think the compiler is right to warn. The 'err' variable is set
> > inside a whilte() and an if() statement, and it is not at all obvious
> > that those codepaths are always taken.
> > 
> > Maybe that "map->m_len" is always guaranteed to be nonzero, and the
> > "while()" statement could be a "do { } while()" one. But if so, make
> > it so, don't write code as if it might never be executed, when the
> > return value seems to *depend* on it being executed.
>   That's caused by my patches (only for certain gcc versions). map->m_len
> is guaranteed to be > 0 in the first iteration (the function is called from
> under if (map->m_len > 0)). I though Ted silenced that warning but
> apparently he did not. The cleanest fix is likely to make a do-while loop
> from that one. I'll send Ted a patch for that.

I did report that warning about 4 weeks ago ... and provided a fix that
was way over the top (but pointed out another problem that was fixed).
Theodore Ts'o - July 3, 2013, 11:35 a.m.
On Tue, Jul 02, 2013 at 08:04:47PM +0200, Jan Kara wrote:
>   That's caused by my patches (only for certain gcc versions). map->m_len
> is guaranteed to be > 0 in the first iteration (the function is called from
> under if (map->m_len > 0)). I though Ted silenced that warning but
> apparently he did not. The cleanest fix is likely to make a do-while loop
> from that one. I'll send Ted a patch for that.

Sorry, I fixed it with a code simplification (I thought the while loop
wasn't needed at all), but when you explained why in fact we still
needed it, I dropped my commit, and forgot that this also dropped the
fix which silenced the warning.  I'll grab your patch and included
with any other fixes that we might need for this merge window.

Linus, are you in a hurry to get this fixed up?  It's a false warning
on gcc's part, so it's not actually causing any actual problems.  If
not, I can wait until a week or so to see if there are any other bug
fixes that are required and push the fix to you towards the end of the
merge window.

							- Ted
--
To unsubscribe from this list: send the line "unsubscribe linux-ext4" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Linus Torvalds - July 3, 2013, 4:09 p.m.
On Wed, Jul 3, 2013 at 4:35 AM, Theodore Ts'o <tytso@mit.edu> wrote:
>
> Linus, are you in a hurry to get this fixed up?  I

No, I just hate seeing warnings in my (simplified) standard build. I'm
used to them in the "allmodconfig" builds I do, but prefer to not see
them when I just build a localized kernel.

But it's not critical. Just as long as I know it will get fixed, I'm happy.

             Linus
--
To unsubscribe from this list: send the line "unsubscribe linux-ext4" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html