fs: port ->setattr() to pass mnt_idmap

[sfrench/cifs-2.6.git] / fs / kernfs / inode.c

diff --git a/fs/kernfs/inode.c b/fs/kernfs/inode.c
index eac0f210299a053a247f7a8eeefbf7d6664ba276..691869b1e9dd8d517ca0c5e2a28fa469cf90d0f3 100644 (file)
--- a/fs/kernfs/inode.c
+++ b/fs/kernfs/inode.c
@@ -107,7 +107,7 @@ int kernfs_setattr(struct kernfs_node *kn, const struct iattr *iattr)
        return ret;
 }
 
-int kernfs_iop_setattr(struct user_namespace *mnt_userns, struct dentry *dentry,
+int kernfs_iop_setattr(struct mnt_idmap *idmap, struct dentry *dentry,
                       struct iattr *iattr)
 {
        struct inode *inode = d_inode(dentry);
@@ -120,7 +120,7 @@ int kernfs_iop_setattr(struct user_namespace *mnt_userns, struct dentry *dentry,
 
        root = kernfs_root(kn);
        down_write(&root->kernfs_rwsem);
-       error = setattr_prepare(&init_user_ns, dentry, iattr);
+       error = setattr_prepare(&nop_mnt_idmap, dentry, iattr);
        if (error)
                goto out;
 
@@ -129,7 +129,7 @@ int kernfs_iop_setattr(struct user_namespace *mnt_userns, struct dentry *dentry,
                goto out;
 
        /* this ignores size changes */
-       setattr_copy(&init_user_ns, inode, iattr);
+       setattr_copy(&nop_mnt_idmap, inode, iattr);
 
 out:
        up_write(&root->kernfs_rwsem);