Linus Torvalds aab174f0df Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
Pull vfs update from Al Viro:

 - big one - consolidation of descriptor-related logics; almost all of
   that is moved to fs/file.c

   (BTW, I'm seriously tempted to rename the result to fd.c.  As it is,
   we have a situation when file_table.c is about handling of struct
   file and file.c is about handling of descriptor tables; the reasons
   are historical - file_table.c used to be about a static array of
   struct file we used to have way back).

   A lot of stray ends got cleaned up and converted to saner primitives,
   disgusting mess in android/binder.c is still disgusting, but at least
   doesn't poke so much in descriptor table guts anymore.  A bunch of
   relatively minor races got fixed in process, plus an ext4 struct file
   leak.

 - related thing - fget_light() partially unuglified; see fdget() in
   there (and yes, it generates the code as good as we used to have).

 - also related - bits of Cyrill's procfs stuff that got entangled into
   that work; _not_ all of it, just the initial move to fs/proc/fd.c and
   switch of fdinfo to seq_file.

 - Alex's fs/coredump.c spiltoff - the same story, had been easier to
   take that commit than mess with conflicts.  The rest is a separate
   pile, this was just a mechanical code movement.

 - a few misc patches all over the place.  Not all for this cycle,
   there'll be more (and quite a few currently sit in akpm's tree)."

Fix up trivial conflicts in the android binder driver, and some fairly
simple conflicts due to two different changes to the sock_alloc_file()
interface ("take descriptor handling from sock_alloc_file() to callers"
vs "net: Providing protocol type via system.sockprotoname xattr of
/proc/PID/fd entries" adding a dentry name to the socket)

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs: (72 commits)
  MAX_LFS_FILESIZE should be a loff_t
  compat: fs: Generic compat_sys_sendfile implementation
  fs: push rcu_barrier() from deactivate_locked_super() to filesystems
  btrfs: reada_extent doesn't need kref for refcount
  coredump: move core dump functionality into its own file
  coredump: prevent double-free on an error path in core dumper
  usb/gadget: fix misannotations
  fcntl: fix misannotations
  ceph: don't abuse d_delete() on failure exits
  hypfs: ->d_parent is never NULL or negative
  vfs: delete surplus inode NULL check
  switch simple cases of fget_light to fdget
  new helpers: fdget()/fdput()
  switch o2hb_region_dev_write() to fget_light()
  proc_map_files_readdir(): don't bother with grabbing files
  make get_file() return its argument
  vhost_set_vring(): turn pollstart/pollstop into bool
  switch prctl_set_mm_exe_file() to fget_light()
  switch xfs_find_handle() to fget_light()
  switch xfs_swapext() to fget_light()
  ...
2012-10-02 20:25:04 -07:00
..
2012-03-28 18:30:02 +01:00
2012-03-28 18:30:02 +01:00
2012-03-28 18:30:02 +01:00
2012-03-28 18:30:02 +01:00
2011-03-31 11:26:23 -03:00
2011-03-31 11:26:23 -03:00
2012-08-24 20:26:06 +10:00
2012-03-28 18:30:02 +01:00
2012-07-10 19:18:59 +10:00
2012-03-28 18:30:02 +01:00
2011-07-26 16:49:47 -07:00
2012-03-28 18:30:02 +01:00
2011-11-08 14:51:46 +11:00
2012-03-20 21:48:30 +08:00
2012-07-24 12:01:20 -07:00
2008-08-18 21:40:03 +02:00
2008-08-04 13:18:17 +10:00
2011-12-08 14:02:23 +11:00
2011-03-31 11:26:23 -03:00
2011-05-22 08:47:53 -04:00
2012-04-08 12:54:33 +03:00
2010-06-09 11:12:36 +02:00
2011-07-26 16:49:47 -07:00
2012-04-30 15:37:16 +10:00
2010-05-05 09:11:10 -04:00
2011-12-07 18:02:02 +11:00
2012-03-09 13:25:06 +11:00
2011-03-31 11:26:23 -03:00
2010-10-26 16:52:08 -07:00
2011-03-31 11:26:23 -03:00
2011-07-26 16:49:47 -07:00
2009-04-07 15:18:58 +10:00
2009-12-09 17:10:37 +11:00
2011-09-20 09:19:40 +10:00
2010-03-05 03:04:08 -06:00
2012-03-28 15:58:21 -07:00
2011-04-20 17:01:19 +10:00
2012-03-28 18:30:02 +01:00
2011-03-31 11:26:23 -03:00
2012-06-02 10:44:11 -04:00
2008-09-06 19:30:15 +01:00
2009-08-28 14:24:10 +10:00
2011-03-31 11:26:23 -03:00
2012-07-11 14:18:40 +10:00
2011-05-06 13:32:35 +10:00