Merge tag 'dmaengine-5.12-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul...

[linux-2.6-microblaze.git] / fs / ocfs2 / namei.c

diff --git a/fs/ocfs2/namei.c b/fs/ocfs2/namei.c
index 2a237ab..3abdd36 100644 (file)
--- a/fs/ocfs2/namei.c
+++ b/fs/ocfs2/namei.c
@@ -198,7 +198,7 @@ static struct inode *ocfs2_get_init_inode(struct inode *dir, umode_t mode)
         * callers. */
        if (S_ISDIR(mode))
                set_nlink(inode, 2);
-       inode_init_owner(inode, dir, mode);
+       inode_init_owner(&init_user_ns, inode, dir, mode);
        status = dquot_initialize(inode);
        if (status)
                return ERR_PTR(status);
@@ -221,7 +221,8 @@ static void ocfs2_cleanup_add_entry_failure(struct ocfs2_super *osb,
        iput(inode);
 }
 
-static int ocfs2_mknod(struct inode *dir,
+static int ocfs2_mknod(struct user_namespace *mnt_userns,
+                      struct inode *dir,
                       struct dentry *dentry,
                       umode_t mode,
                       dev_t dev)
@@ -645,7 +646,8 @@ static int ocfs2_mknod_locked(struct ocfs2_super *osb,
        return status;
 }
 
-static int ocfs2_mkdir(struct inode *dir,
+static int ocfs2_mkdir(struct user_namespace *mnt_userns,
+                      struct inode *dir,
                       struct dentry *dentry,
                       umode_t mode)
 {
@@ -653,14 +655,15 @@ static int ocfs2_mkdir(struct inode *dir,
 
        trace_ocfs2_mkdir(dir, dentry, dentry->d_name.len, dentry->d_name.name,
                          OCFS2_I(dir)->ip_blkno, mode);
-       ret = ocfs2_mknod(dir, dentry, mode | S_IFDIR, 0);
+       ret = ocfs2_mknod(&init_user_ns, dir, dentry, mode | S_IFDIR, 0);
        if (ret)
                mlog_errno(ret);
 
        return ret;
 }
 
-static int ocfs2_create(struct inode *dir,
+static int ocfs2_create(struct user_namespace *mnt_userns,
+                       struct inode *dir,
                        struct dentry *dentry,
                        umode_t mode,
                        bool excl)
@@ -669,7 +672,7 @@ static int ocfs2_create(struct inode *dir,
 
        trace_ocfs2_create(dir, dentry, dentry->d_name.len, dentry->d_name.name,
                           (unsigned long long)OCFS2_I(dir)->ip_blkno, mode);
-       ret = ocfs2_mknod(dir, dentry, mode | S_IFREG, 0);
+       ret = ocfs2_mknod(&init_user_ns, dir, dentry, mode | S_IFREG, 0);
        if (ret)
                mlog_errno(ret);
 
@@ -1195,7 +1198,8 @@ static void ocfs2_double_unlock(struct inode *inode1, struct inode *inode2)
                ocfs2_inode_unlock(inode2, 1);
 }
 
-static int ocfs2_rename(struct inode *old_dir,
+static int ocfs2_rename(struct user_namespace *mnt_userns,
+                       struct inode *old_dir,
                        struct dentry *old_dentry,
                        struct inode *new_dir,
                        struct dentry *new_dentry,
@@ -1784,7 +1788,8 @@ bail:
        return status;
 }
 
-static int ocfs2_symlink(struct inode *dir,
+static int ocfs2_symlink(struct user_namespace *mnt_userns,
+                        struct inode *dir,
                         struct dentry *dentry,
                         const char *symname)
 {