From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 16 Nov 2018 17:38:14 +0000 (-0600)
Subject: Merge tag 'gfs2-4.20.fixes3' of git://git.kernel.org/pub/scm/linux/kernel/git/gfs2... 
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=e6a2562fe27f0a42243ca5a0aec5408c9a1d42a5;p=openwrt%2Fstaging%2Fblogic.git

Merge tag 'gfs2-4.20.fixes3' of git://git./linux/kernel/git/gfs2/linux-gfs2

Pull bfs2 fixes from Andreas Gruenbacher:
 "Fix two bugs leading to leaked buffer head references:

   - gfs2: Put bitmap buffers in put_super
   - gfs2: Fix iomap buffer head reference counting bug

  And one bug leading to significant slow-downs when deleting large
  files:

   - gfs2: Fix metadata read-ahead during truncate (2)"

* tag 'gfs2-4.20.fixes3' of git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2:
  gfs2: Fix iomap buffer head reference counting bug
  gfs2: Fix metadata read-ahead during truncate (2)
  gfs2: Put bitmap buffers in put_super
---

e6a2562fe27f0a42243ca5a0aec5408c9a1d42a5
diff --cc fs/gfs2/bmap.c
index a683d9b27d76,0d643306c255..9a4a15d646eb
--- a/fs/gfs2/bmap.c
+++ b/fs/gfs2/bmap.c
@@@ -1056,8 -1049,7 +1049,7 @@@ static int gfs2_iomap_begin_write(struc
  			goto out_qunlock;
  		}
  	}
- 	release_metapath(&mp);
 -	if (gfs2_is_jdata(ip))
 +	if (!gfs2_is_stuffed(ip) && gfs2_is_jdata(ip))
  		iomap->page_done = gfs2_iomap_journaled_page_done;
  	return 0;