From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 3 Sep 2015 19:28:30 +0000 (-0700)
Subject: Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs
X-Git-Tag: v4.14-rc1~4775
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e31fb9e00543e5d3c5b686747d3c862bc09b59f3;p=platform%2Fkernel%2Flinux-rpi.git

Merge branch 'for_linus' of git://git./linux/kernel/git/jack/linux-fs

Pull ext3 removal, quota & udf fixes from Jan Kara:
 "The biggest change in the pull is the removal of ext3 filesystem
  driver (~28k lines removed).  Ext4 driver is a full featured
  replacement these days and both RH and SUSE use it for several years
  without issues.  Also there are some workarounds in VM & block layer
  mainly for ext3 which we could eventually get rid of.

  Other larger change is addition of proper error handling for
  dquot_initialize().  The rest is small fixes and cleanups"

[ I wasn't convinced about the ext3 removal and worried about things
  falling through the cracks for legacy users, but ext4 maintainers
  piped up and were all unanimously in favor of removal, and maintaining
  all legacy ext3 support inside ext4.   - Linus ]

* 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs:
  udf: Don't modify filesystem for read-only mounts
  quota: remove an unneeded condition
  ext4: memory leak on error in ext4_symlink()
  mm/Kconfig: NEED_BOUNCE_POOL: clean-up condition
  ext4: Improve ext4 Kconfig test
  block: Remove forced page bouncing under IO
  fs: Remove ext3 filesystem driver
  doc: Update doc about journalling layer
  jfs: Handle error from dquot_initialize()
  reiserfs: Handle error from dquot_initialize()
  ocfs2: Handle error from dquot_initialize()
  ext4: Handle error from dquot_initialize()
  ext2: Handle error from dquot_initalize()
  quota: Propagate error from ->acquire_dquot()
---

e31fb9e00543e5d3c5b686747d3c862bc09b59f3
diff --cc block/bounce.c
index 2c310ea,31cad13..0611aea
--- a/block/bounce.c
+++ b/block/bounce.c
@@@ -161,42 -160,24 +161,24 @@@ static void __bounce_end_io_read(struc
  {
  	struct bio *bio_orig = bio->bi_private;
  
 -	if (test_bit(BIO_UPTODATE, &bio->bi_flags))
 +	if (!bio->bi_error)
  		copy_to_high_bio_irq(bio_orig, bio);
  
 -	bounce_end_io(bio, pool, err);
 +	bounce_end_io(bio, pool);
  }
  
 -static void bounce_end_io_read(struct bio *bio, int err)
 +static void bounce_end_io_read(struct bio *bio)
  {
 -	__bounce_end_io_read(bio, page_pool, err);
 +	__bounce_end_io_read(bio, page_pool);
  }
  
 -static void bounce_end_io_read_isa(struct bio *bio, int err)
 +static void bounce_end_io_read_isa(struct bio *bio)
  {
 -	__bounce_end_io_read(bio, isa_page_pool, err);
 +	__bounce_end_io_read(bio, isa_page_pool);
  }
  
- #ifdef CONFIG_NEED_BOUNCE_POOL
- static int must_snapshot_stable_pages(struct request_queue *q, struct bio *bio)
- {
- 	if (bio_data_dir(bio) != WRITE)
- 		return 0;
- 
- 	if (!bdi_cap_stable_pages_required(&q->backing_dev_info))
- 		return 0;
- 
- 	return bio_flagged(bio, BIO_SNAP_STABLE);
- }
- #else
- static int must_snapshot_stable_pages(struct request_queue *q, struct bio *bio)
- {
- 	return 0;
- }
- #endif /* CONFIG_NEED_BOUNCE_POOL */
- 
  static void __blk_queue_bounce(struct request_queue *q, struct bio **bio_orig,
- 			       mempool_t *pool, int force)
+ 			       mempool_t *pool)
  {
  	struct bio *bio;
  	int rw = bio_data_dir(*bio_orig);