From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 11 Aug 2020 01:22:43 +0000 (-0700)
Subject: Merge tag 'gfs2-for-5.9' of git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux... 
X-Git-Tag: v5.10.7~1880
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=8c2618a6d0f7b08e2b41575a87cf568745c8860e;p=platform%2Fkernel%2Flinux-rpi.git

Merge tag 'gfs2-for-5.9' of git://git./linux/kernel/git/gfs2/linux-gfs2

Pull gfs2 updates from Andreas Gruenbacher:

 - Make sure transactions won't be started recursively in
   gfs2_block_zero_range (bug introduced in 5.4 when switching to
   iomap_zero_range)

 - Fix a glock holder refcount leak introduced in the iopen glock
   locking scheme rework merged in 5.8.

 - A few other small improvements (debugging, stack usage, comment
   fixes).

* tag 'gfs2-for-5.9' of git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2:
  gfs2: When gfs2_dirty_inode gets a glock error, dump the glock
  gfs2: Never call gfs2_block_zero_range with an open transaction
  gfs2: print details on transactions that aren't properly ended
  gfs2: Fix inaccurate comment
  fs: Fix typo in comment
  gfs2: Fix refcount leak in gfs2_glock_poke
  gfs2: Pass glock holder to gfs2_file_direct_{read,write}
  gfs2: Add some flags missing from glock output
---

8c2618a6d0f7b08e2b41575a87cf568745c8860e
diff --cc fs/gfs2/file.c
index b085a3b,847adb9..b39b339fe
--- a/fs/gfs2/file.c
+++ b/fs/gfs2/file.c
@@@ -835,12 -835,11 +835,12 @@@ static ssize_t gfs2_file_direct_write(s
  
  	ret = iomap_dio_rw(iocb, from, &gfs2_iomap_ops, NULL,
  			   is_sync_kiocb(iocb));
 -
 +	if (ret == -ENOTBLK)
 +		ret = 0;
  out:
- 	gfs2_glock_dq(&gh);
+ 	gfs2_glock_dq(gh);
  out_uninit:
- 	gfs2_holder_uninit(&gh);
+ 	gfs2_holder_uninit(gh);
  	return ret;
  }