Merge tag 'pm-6.4-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael...

[tomoyo/tomoyo-test1.git] / fs / kernfs / inode.c

diff --git a/fs/kernfs/inode.c b/fs/kernfs/inode.c
index 30494dc..b22b74d 100644 (file)
--- a/fs/kernfs/inode.c
+++ b/fs/kernfs/inode.c
@@ -101,9 +101,9 @@ int kernfs_setattr(struct kernfs_node *kn, const struct iattr *iattr)
        int ret;
        struct kernfs_root *root = kernfs_root(kn);
 
-       down_write(&root->kernfs_rwsem);
+       down_write(&root->kernfs_iattr_rwsem);
        ret = __kernfs_setattr(kn, iattr);
-       up_write(&root->kernfs_rwsem);
+       up_write(&root->kernfs_iattr_rwsem);
        return ret;
 }
 
@@ -119,7 +119,7 @@ int kernfs_iop_setattr(struct mnt_idmap *idmap, struct dentry *dentry,
                return -EINVAL;
 
        root = kernfs_root(kn);
-       down_write(&root->kernfs_rwsem);
+       down_write(&root->kernfs_iattr_rwsem);
        error = setattr_prepare(&nop_mnt_idmap, dentry, iattr);
        if (error)
                goto out;
@@ -132,7 +132,7 @@ int kernfs_iop_setattr(struct mnt_idmap *idmap, struct dentry *dentry,
        setattr_copy(&nop_mnt_idmap, inode, iattr);
 
 out:
-       up_write(&root->kernfs_rwsem);
+       up_write(&root->kernfs_iattr_rwsem);
        return error;
 }
 
@@ -189,10 +189,10 @@ int kernfs_iop_getattr(struct mnt_idmap *idmap,
        struct kernfs_node *kn = inode->i_private;
        struct kernfs_root *root = kernfs_root(kn);
 
-       down_read(&root->kernfs_rwsem);
+       down_read(&root->kernfs_iattr_rwsem);
        kernfs_refresh_inode(kn, inode);
        generic_fillattr(&nop_mnt_idmap, inode, stat);
-       up_read(&root->kernfs_rwsem);
+       up_read(&root->kernfs_iattr_rwsem);
 
        return 0;
 }
@@ -285,10 +285,10 @@ int kernfs_iop_permission(struct mnt_idmap *idmap,
        kn = inode->i_private;
        root = kernfs_root(kn);
 
-       down_read(&root->kernfs_rwsem);
+       down_read(&root->kernfs_iattr_rwsem);
        kernfs_refresh_inode(kn, inode);
        ret = generic_permission(&nop_mnt_idmap, inode, mask);
-       up_read(&root->kernfs_rwsem);
+       up_read(&root->kernfs_iattr_rwsem);
 
        return ret;
 }