From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 18 Feb 2015 00:12:34 +0000 (-0800)
Subject: Merge branch 'lazytime' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
X-Git-Tag: firefly_0821_release~176^2~2294
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=038911597e17017cee55fe93d521164a27056866;p=firefly-linux-kernel-4.4.55.git

Merge branch 'lazytime' of git://git./linux/kernel/git/viro/vfs

Pull lazytime mount option support from Al Viro:
 "Lazytime stuff from tytso"

* 'lazytime' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
  ext4: add optimization for the lazytime mount option
  vfs: add find_inode_nowait() function
  vfs: add support for a lazytime mount option
---

038911597e17017cee55fe93d521164a27056866
diff --cc fs/ext4/super.c
index 10e8c6b7ca08,362b23c8497a..1adac6868e6f
--- a/fs/ext4/super.c
+++ b/fs/ext4/super.c
@@@ -1124,8 -1137,9 +1124,9 @@@ enum 
  	Opt_usrjquota, Opt_grpjquota, Opt_offusrjquota, Opt_offgrpjquota,
  	Opt_jqfmt_vfsold, Opt_jqfmt_vfsv0, Opt_jqfmt_vfsv1, Opt_quota,
  	Opt_noquota, Opt_barrier, Opt_nobarrier, Opt_err,
 -	Opt_usrquota, Opt_grpquota, Opt_i_version,
 +	Opt_usrquota, Opt_grpquota, Opt_i_version, Opt_dax,
  	Opt_stripe, Opt_delalloc, Opt_nodelalloc, Opt_mblk_io_submit,
+ 	Opt_lazytime, Opt_nolazytime,
  	Opt_nomblk_io_submit, Opt_block_validity, Opt_noblock_validity,
  	Opt_inode_readahead_blks, Opt_journal_ioprio,
  	Opt_dioread_nolock, Opt_dioread_lock,
@@@ -1187,9 -1201,10 +1188,11 @@@ static const match_table_t tokens = 
  	{Opt_barrier, "barrier"},
  	{Opt_nobarrier, "nobarrier"},
  	{Opt_i_version, "i_version"},
 +	{Opt_dax, "dax"},
  	{Opt_stripe, "stripe=%u"},
  	{Opt_delalloc, "delalloc"},
+ 	{Opt_lazytime, "lazytime"},
+ 	{Opt_nolazytime, "nolazytime"},
  	{Opt_nodelalloc, "nodelalloc"},
  	{Opt_removed, "mblk_io_submit"},
  	{Opt_removed, "nomblk_io_submit"},