From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 20 May 2016 22:11:26 +0000 (-0700)
Subject: Merge tag 'gfs2-4.7.fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/gfs2... 
X-Git-Tag: v4.7-rc1~99
X-Git-Url: http://git.samba.org/samba.git/?p=sfrench%2Fcifs-2.6.git;a=commitdiff_plain;h=be1332c0994fbf016fa4ef0f0c4acda566fe6cb3

Merge tag 'gfs2-4.7.fixes' of git://git./linux/kernel/git/gfs2/linux-gfs2

Pull GFS2 updates from Bob Peterson:
 "We've got nine patches this time:

   - Abhi Das has two patches that fix a GFS2 splice issue (and an
     adjustment).

   - Ben Marzinski has a patch which allows the proper unmount of a GFS2
     file system after hitting a withdraw error.

   - I have a patch to fix a problem where GFS2 would dereference an
     error value, plus three cosmetic / refactoring patches.

   - Daniel DeFreez has a patch to fix two glock reference count
     problems, where GFS2 was not properly "uninitializing" its glock
     holder on error paths.

   - Denys Vlasenko has a patch to change a function to not be inlined,
     thus reducing the memory footprint of the GFS2 module"

* tag 'gfs2-4.7.fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2:
  GFS2: Refactor gfs2_remove_from_journal
  GFS2: Remove allocation parms from gfs2_rbm_find
  gfs2: use inode_lock/unlock instead of accessing i_mutex directly
  GFS2: Add calls to gfs2_holder_uninit in two error handlers
  GFS2: Don't dereference inode in gfs2_inode_lookup until it's valid
  GFS2: fs/gfs2/glock.c: Deinline do_error, save 1856 bytes
  gfs2: Use gfs2 wrapper to sync inode before calling generic_file_splice_read()
  GFS2: Get rid of dead code in inode_go_demote_ok
  GFS2: ignore unlock failures after withdraw
---

be1332c0994fbf016fa4ef0f0c4acda566fe6cb3
diff --cc fs/gfs2/aops.c
index 8524c0e322fc,e21a931ced53..37b7bc14c8da
--- a/fs/gfs2/aops.c
+++ b/fs/gfs2/aops.c
@@@ -1099,9 -1099,10 +1099,10 @@@ static ssize_t gfs2_direct_IO(struct ki
  	}
  
  	rv = __blockdev_direct_IO(iocb, inode, inode->i_sb->s_bdev, iter,
 -				  offset, gfs2_get_block_direct, NULL, NULL, 0);
 +				  gfs2_get_block_direct, NULL, NULL, 0);
  out:
  	gfs2_glock_dq(&gh);
+ out_uninit:
  	gfs2_holder_uninit(&gh);
  	return rv;
  }