2
0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-23 20:53:53 +08:00
linux-next/fs/hfsplus
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
..
bfind.c hfsplus: over 80 character lines clean-up 2010-12-16 18:08:45 +01:00
bitmap.c hfsplus: get rid of write_super 2012-07-22 23:58:04 +04:00
bnode.c hfsplus: %L-to-%ll, macro correction, and remove unneeded braces 2010-12-16 18:08:46 +01:00
brec.c hfsplus: Add additional range check to handle on-disk corruptions 2011-07-22 16:36:56 +02:00
btree.c hfsplus: over 80 character lines clean-up 2010-12-16 18:08:45 +01:00
catalog.c userns: Convert hfsplus to use kuid and kgid where appropriate 2012-09-21 03:13:12 -07:00
dir.c hfsplus: get rid of write_super 2012-07-22 23:58:04 +04:00
extents.c hfsplus: Add error propagation for hfsplus_ext_write_extent_locked 2011-07-07 17:45:46 +02:00
hfsplus_fs.h userns: Convert hfsplus to use kuid and kgid where appropriate 2012-09-21 03:13:12 -07:00
hfsplus_raw.h hfsplus: change finder_info to u32 2012-03-20 21:29:52 -04:00
inode.c userns: Convert hfsplus to use kuid and kgid where appropriate 2012-09-21 03:13:12 -07:00
ioctl.c hfsplus: fix bless ioctl when used with hardlinks 2012-06-17 14:39:59 -07:00
Kconfig fs/Kconfig: move hfs, hfsplus out 2009-01-22 13:15:57 +03:00
Makefile Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
options.c userns: Convert hfsplus to use kuid and kgid where appropriate 2012-09-21 03:13:12 -07:00
part_tbl.c hfsplus: ensure bio requests are not smaller than the hardware sectors 2011-07-22 16:37:44 +02:00
super.c fs: push rcu_barrier() from deactivate_locked_super() to filesystems 2012-10-02 21:35:55 -04:00
tables.c Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
unicode.c hfsplus: assignments inside `if' condition clean-up 2011-06-30 13:40:58 +02:00
wrapper.c hfsplus: fix overflow in sector calculations in hfsplus_submit_bio 2012-06-17 14:39:45 -07:00