Merge remote-tracking branch 'jk/vfs' into work.misc

3 files changed, 3 insertions, 3 deletions

diff --git a/fs/proc/base.c b/fs/proc/base.c
index 528c1bb57bc3..09f0f173821a 100644
--- a/fs/proc/base.c
+++ b/fs/proc/base.c
@@ -692,7 +692,7 @@ int proc_setattr(struct dentry *dentry, struct iattr *attr)
         if (attr->ia_valid & ATTR_MODE)
                 return -EPERM;
 
-        error = inode_change_ok(inode, attr);
+        error = setattr_prepare(dentry, attr);
         if (error)
                 return error;
 
diff --git a/fs/proc/generic.c b/fs/proc/generic.c
index c633476616e0..23ff30e3c1e7 100644
--- a/fs/proc/generic.c
+++ b/fs/proc/generic.c
@@ -105,7 +105,7 @@ static int proc_notify_change(struct dentry *dentry, struct iattr *iattr)
         struct proc_dir_entry *de = PDE(inode);
         int error;
 
-        error = inode_change_ok(inode, iattr);
+        error = setattr_prepare(dentry, iattr);
         if (error)
                 return error;
 
diff --git a/fs/proc/proc_sysctl.c b/fs/proc/proc_sysctl.c
index 1b93650dda2f..268fcf592b0e 100644
--- a/fs/proc/proc_sysctl.c
+++ b/fs/proc/proc_sysctl.c
@@ -754,7 +754,7 @@ static int proc_sys_setattr(struct dentry *dentry, struct iattr *attr)
         if (attr->ia_valid & (ATTR_MODE | ATTR_UID | ATTR_GID))
                 return -EPERM;
 
-        error = inode_change_ok(inode, attr);
+        error = setattr_prepare(dentry, attr);
         if (error)
                 return error;