Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 16 Dec 2016 18:24:44 +0000 (10:24 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 16 Dec 2016 18:24:44 +0000 (10:24 -0800)
Pull vfs updates from Al Viro:

 - more ->d_init() stuff (work.dcache)

 - pathname resolution cleanups (work.namei)

 - a few missing iov_iter primitives - copy_from_iter_full() and
   friends. Either copy the full requested amount, advance the iterator
   and return true, or fail, return false and do _not_ advance the
   iterator. Quite a few open-coded callers converted (and became more
   readable and harder to fuck up that way) (work.iov_iter)

 - several assorted patches, the big one being logfs removal

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
  logfs: remove from tree
  vfs: fix put_compat_statfs64() does not handle errors
  namei: fold should_follow_link() with the step into not-followed link
  namei: pass both WALK_GET and WALK_MORE to should_follow_link()
  namei: invert WALK_PUT logics
  namei: shift interpretation of LOOKUP_FOLLOW inside should_follow_link()
  namei: saner calling conventions for mountpoint_last()
  namei.c: get rid of user_path_parent()
  switch getfrag callbacks to ..._full() primitives
  make skb_add_data,{_nocache}() and skb_copy_to_page_nocache() advance only on success
  [iov_iter] new primitives - copy_from_iter_full() and friends
  don't open-code file_inode()
  ceph: switch to use of ->d_init()
  ceph: unify dentry_operations instances
  lustre: switch to use of ->d_init()

31 files changed:
1  2 
MAINTAINERS
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c
drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
drivers/net/macvtap.c
drivers/net/tun.c
drivers/staging/greybus/camera.c
drivers/staging/greybus/es2.c
drivers/staging/greybus/timesync.c
drivers/staging/lustre/lustre/llite/llite_internal.h
drivers/staging/lustre/lustre/llite/llite_nfs.c
drivers/staging/lustre/lustre/llite/namei.c
drivers/staging/lustre/lustre/llite/statahead.c
drivers/usb/gadget/function/f_fs.c
drivers/vhost/scsi.c
drivers/vhost/vhost.c
fs/Kconfig
fs/ceph/dir.c
fs/orangefs/orangefs-debugfs.c
include/linux/skbuff.h
include/linux/uio.h
include/net/sock.h
include/net/udplite.h
kernel/audit_watch.c
kernel/events/core.c
kernel/printk/printk.c
lib/iov_iter.c
net/ipv4/ip_output.c
net/ipv4/ping.c
net/packet/af_packet.c
security/smack/smack_lsm.c

diff --cc MAINTAINERS
Simple merge
index cc8aafd9cb0d4160cd8578001ac45236ec778c65,3c28589722171b3991a43e1391b713fdcb929be5..60bd4afe45c8c550b48e4484bf4d42f279f161c5
  static ssize_t amdgpu_debugfs_regs_write(struct file *f, const char __user *buf,
                                         size_t size, loff_t *pos)
  {
-       struct amdgpu_device *adev = f->f_inode->i_private;
+       struct amdgpu_device *adev = file_inode(f)->i_private;
        ssize_t result = 0;
        int r;
 +      bool pm_pg_lock, use_bank;
 +      unsigned instance_bank, sh_bank, se_bank;
  
        if (size & 0x3 || *pos & 0x3)
                return -EINVAL;
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
index 4769a2230ae1cdcb05b904fe7284de471c2216d1,166323fddc449da2bf78dc321ce50b3094bb66b3..f1ee17f9ec0da1ef311cce71a4c5ec97d66c87d5
@@@ -1519,9 -1512,8 +1519,7 @@@ out_unplug
         * dentry_may_statahead().
         */
        ldd = ll_d2d(*dentryp);
-       /* ldd can be NULL if llite lookup failed. */
-       if (ldd)
-               ldd->lld_sa_generation = lli->lli_sa_generation;
 -      lli = ll_i2info(dir);
+       ldd->lld_sa_generation = lli->lli_sa_generation;
        sa_put(sai, entry);
        return rc;
  }
Simple merge
Simple merge
Simple merge
diff --cc fs/Kconfig
Simple merge
diff --cc fs/ceph/dir.c
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc lib/iov_iter.c
Simple merge
Simple merge
diff --cc net/ipv4/ping.c
Simple merge
Simple merge
Simple merge