From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 17 Apr 2015 02:19:33 +0000 (-0400)
Subject: Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs
X-Git-Tag: firefly_0821_release~176^2~1950
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=84588e7a5d8220446d677d7b909a20ee7a4496b9;p=firefly-linux-kernel-4.4.55.git

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

Pull quota and udf updates from Jan Kara:
 "The pull contains quota changes which complete unification of XFS and
  VFS quota interfaces (so tools can use either interface to manipulate
  any filesystem).  There's also a patch to support project quotas in
  VFS quota subsystem from Li Xi.

  Finally there's a bunch of UDF fixes and cleanups and tiny cleanup in
  reiserfs & ext3"

* 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs: (21 commits)
  udf: Update ctime and mtime when directory is modified
  udf: return correct errno for udf_update_inode()
  ext3: Remove useless condition in if statement.
  vfs: Add general support to enforce project quota limits
  reiserfs: fix __RASSERT format string
  udf: use int for allocated blocks instead of sector_t
  udf: remove redundant buffer_head.h includes
  udf: remove else after return in __load_block_bitmap()
  udf: remove unused variable in udf_table_free_blocks()
  quota: Fix maximum quota limit settings
  quota: reorder flags in quota state
  quota: paranoia: check quota tree root
  quota: optimize i_dquot access
  quota: Hook up Q_XSETQLIM for id 0 to ->set_info
  xfs: Add support for Q_SETINFO
  quota: Make ->set_info use structure with neccesary info to VFS and XFS
  quota: Remove ->get_xstate and ->get_xstatev callbacks
  gfs2: Convert to using ->get_state callback
  xfs: Convert to using ->get_state callback
  quota: Wire up Q_GETXSTATE and Q_GETXSTATV calls to work with ->get_state
  ...
---

84588e7a5d8220446d677d7b909a20ee7a4496b9
diff --cc fs/udf/file.c
index 74050bff64f4,dda8ea7012c6..f77f7681288f
--- a/fs/udf/file.c
+++ b/fs/udf/file.c
@@@ -33,8 -33,7 +33,7 @@@
  #include <linux/capability.h>
  #include <linux/errno.h>
  #include <linux/pagemap.h>
- #include <linux/buffer_head.h>
 -#include <linux/aio.h>
 +#include <linux/uio.h>
  
  #include "udf_i.h"
  #include "udf_sb.h"