From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 16 Dec 2016 18:24:44 +0000 (-0800)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=9a19a6db37ee0b7a6db796b3dcd6bb6e7237d6ea;p=linux-beck.git

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

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()
---

9a19a6db37ee0b7a6db796b3dcd6bb6e7237d6ea
diff --cc drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
index cc8aafd9cb0d,3c2858972217..60bd4afe45c8
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
@@@ -2599,11 -2570,9 +2599,11 @@@ end
  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;
diff --cc drivers/staging/lustre/lustre/llite/statahead.c
index 4769a2230ae1,166323fddc44..f1ee17f9ec0d
--- a/drivers/staging/lustre/lustre/llite/statahead.c
+++ b/drivers/staging/lustre/lustre/llite/statahead.c
@@@ -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;
  }