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

3 files changed, 13 insertions, 13 deletions

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
index cc8aafd9cb0d..60bd4afe45c8 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
@@ -2523,7 +2523,7 @@ static void amdgpu_debugfs_remove_files(struct amdgpu_device *adev)
 static ssize_t amdgpu_debugfs_regs_read(struct file *f, 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;
@@ -2599,7 +2599,7 @@ 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;
@@ -2673,7 +2673,7 @@ static ssize_t amdgpu_debugfs_regs_write(struct file *f, const char __user *buf,
 static ssize_t amdgpu_debugfs_regs_pcie_read(struct file *f, 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;
 
@@ -2700,7 +2700,7 @@ static ssize_t amdgpu_debugfs_regs_pcie_read(struct file *f, char __user *buf,
 static ssize_t amdgpu_debugfs_regs_pcie_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;
 
@@ -2728,7 +2728,7 @@ static ssize_t amdgpu_debugfs_regs_pcie_write(struct file *f, const char __user
 static ssize_t amdgpu_debugfs_regs_didt_read(struct file *f, 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;
 
@@ -2755,7 +2755,7 @@ static ssize_t amdgpu_debugfs_regs_didt_read(struct file *f, char __user *buf,
 static ssize_t amdgpu_debugfs_regs_didt_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;
 
@@ -2783,7 +2783,7 @@ static ssize_t amdgpu_debugfs_regs_didt_write(struct file *f, const char __user
 static ssize_t amdgpu_debugfs_regs_smc_read(struct file *f, 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;
 
@@ -2810,7 +2810,7 @@ static ssize_t amdgpu_debugfs_regs_smc_read(struct file *f, char __user *buf,
 static ssize_t amdgpu_debugfs_regs_smc_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;
 
@@ -2838,7 +2838,7 @@ static ssize_t amdgpu_debugfs_regs_smc_write(struct file *f, const char __user *
 static ssize_t amdgpu_debugfs_gca_config_read(struct file *f, 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;
         uint32_t *config, no_regs = 0;
@@ -2908,7 +2908,7 @@ static ssize_t amdgpu_debugfs_gca_config_read(struct file *f, char __user *buf,
 static ssize_t amdgpu_debugfs_sensor_read(struct file *f, 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;
         int idx, r;
         int32_t value;
 
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c
index 4c992826d2d6..a47628395914 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c
@@ -280,7 +280,7 @@ void amdgpu_ring_fini(struct amdgpu_ring *ring)
 static ssize_t amdgpu_debugfs_ring_read(struct file *f, char __user *buf,
                                         size_t size, loff_t *pos)
 {
-        struct amdgpu_ring *ring = (struct amdgpu_ring*)f->f_inode->i_private;
+        struct amdgpu_ring *ring = file_inode(f)->i_private;
         int r, i;
         uint32_t value, result, early[3];
 
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
index bc70f80260d8..8e35c1ff59e3 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
@@ -1511,7 +1511,7 @@ static const struct drm_info_list amdgpu_ttm_debugfs_list[] = {
 static ssize_t amdgpu_ttm_vram_read(struct file *f, 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;
 
@@ -1555,7 +1555,7 @@ static const struct file_operations amdgpu_ttm_vram_fops = {
 static ssize_t amdgpu_ttm_gtt_read(struct file *f, 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;