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

Pull ext4 updates from Ted Ts'o:
 "Pretty much all bug fixes and clean ups for 4.3, after a lot of
  features and other churn going into 4.2"

* tag 'ext4_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4:
  Revert "ext4: remove block_device_ejected"
  ext4: ratelimit the file system mounted message
  ext4: silence a format string false positive
  ext4: simplify some code in read_mmp_block()
  ext4: don't manipulate recovery flag when freezing no-journal fs
  jbd2: limit number of reserved credits
  ext4 crypto: remove duplicate header file
  ext4: update c/mtime on truncate up
  jbd2: avoid infinite loop when destroying aborted journal
  ext4, jbd2: add REQ_FUA flag when recording an error in the superblock
  ext4 crypto: fix spelling typo in comment
  ext4 crypto: exit cleanly if ext4_derive_key_aes() fails
  ext4: reject journal options for ext2 mounts
  ext4: implement cgroup writeback support
  ext4: replace ext4_io_submit->io_op with ->io_wbc
  ext4 crypto: check for too-short encrypted file names
  ext4 crypto: use a jbd2 transaction when adding a crypto policy
  jbd2: speedup jbd2_journal_dirty_metadata()

diff --cc fs/ext4/inode.c
Simple merge

diff --cc fs/ext4/page-io.c
index 8a9d63a0c0710378a46c62ca532734c77fd53291,58ab2e3dd11471abee971bc44026a68072cb38a0..84ba4d2b3a35f58158b8e1c49b57ed74d806c569
--- 1/fs/ext4/page-io.c
--- 2/fs/ext4/page-io.c
+++ b/fs/ext4/page-io.c
@@@ -372,11 -377,13 +374,12 @@@ void ext4_io_submit_init(struct ext4_io
  static int io_submit_init_bio(struct ext4_io_submit *io,
                              struct buffer_head *bh)
  {
 -      int nvecs = bio_get_nr_vecs(bh->b_bdev);
        struct bio *bio;
  
 -      bio = bio_alloc(GFP_NOIO, min(nvecs, BIO_MAX_PAGES));
 +      bio = bio_alloc(GFP_NOIO, BIO_MAX_PAGES);
        if (!bio)
                return -ENOMEM;
+       wbc_init_bio(io->io_wbc, bio);
        bio->bi_iter.bi_sector = bh->b_blocknr * (bh->b_size >> 9);
        bio->bi_bdev = bh->b_bdev;
        bio->bi_end_io = ext4_end_bio;

diff --cc fs/ext4/super.c
Simple merge

diff --cc include/linux/jbd2.h
Simple merge