2
0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-23 12:43:55 +08:00
linux-next/fs/squashfs
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
..
block.c Squashfs: update comment removing reference to zlib only 2012-03-10 03:01:00 +00:00
cache.c Squashfs: optimise squashfs_cache_get entry search 2011-12-30 01:24:13 +00:00
decompressor.c Squashfs: Make ZLIB compression support optional 2011-07-22 03:01:28 +01:00
decompressor.h Squashfs: Make ZLIB compression support optional 2011-07-22 03:01:28 +01:00
dir.c Squashfs: fix f_pos check in get_dir_index_using_offset 2012-03-10 03:01:02 +00:00
export.c Squashfs: Fix sanity check patches on big-endian systems 2011-05-29 10:03:09 +01:00
file.c squashfs: remove the second argument of k[un]map_atomic() 2012-03-20 21:48:25 +08:00
fragment.c Squashfs: Fix sanity check patches on big-endian systems 2011-05-29 10:03:09 +01:00
id.c Squashfs: Fix sanity check patches on big-endian systems 2011-05-29 10:03:09 +01:00
inode.c userns: Convert squashfs to use kuid/kgid where appropriate 2012-09-21 03:13:35 -07:00
Kconfig Merge git://git.kernel.org/pub/scm/linux/kernel/git/pkl/squashfs-next 2011-11-04 16:48:37 -07:00
lzo_wrapper.c Squashfs: extend decompressor framework to handle compression options 2011-02-28 18:21:59 +00:00
Makefile Squashfs: Make ZLIB compression support optional 2011-07-22 03:01:28 +01:00
namei.c stop passing nameidata to ->lookup() 2012-07-14 16:34:32 +04:00
squashfs_fs_i.h Squashfs: update email address 2011-05-26 10:49:11 +01:00
squashfs_fs_sb.h Squashfs: optimise squashfs_cache_get entry search 2011-12-30 01:24:13 +00:00
squashfs_fs.h Squashfs: get rid of obsolete definitions in header file 2012-03-10 03:01:01 +00:00
squashfs.h Squashfs: Make ZLIB compression support optional 2011-07-22 03:01:28 +01:00
super.c fs: push rcu_barrier() from deactivate_locked_super() to filesystems 2012-10-02 21:35:55 -04:00
symlink.c squashfs: remove the second argument of k[un]map_atomic() 2012-03-20 21:48:25 +08:00
xattr_id.c Squashfs: update email address 2011-05-26 10:49:11 +01:00
xattr.c Squashfs: update email address 2011-05-26 10:49:11 +01:00
xattr.h Squashfs: update email address 2011-05-26 10:49:11 +01:00
xz_wrapper.c Squashfs: update email address 2011-05-26 10:49:11 +01:00
zlib_wrapper.c Squashfs: update email address 2011-05-26 10:49:11 +01:00