Merge tag 'pwm/for-5.12-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/thierry...

[linux-2.6-microblaze.git] / fs / orangefs / inode.c

diff --git a/fs/orangefs/inode.c b/fs/orangefs/inode.c
index 12ae630..5079cfa 100644 (file)
--- a/fs/orangefs/inode.c
+++ b/fs/orangefs/inode.c
@@ -62,12 +62,7 @@ static int orangefs_writepage_locked(struct page *page,
        } else {
                ret = 0;
        }
-       if (wr) {
-               kfree(wr);
-               set_page_private(page, 0);
-               ClearPagePrivate(page);
-               put_page(page);
-       }
+       kfree(detach_page_private(page));
        return ret;
 }
 
@@ -409,9 +404,7 @@ static int orangefs_write_begin(struct file *file,
        wr->len = len;
        wr->uid = current_fsuid();
        wr->gid = current_fsgid();
-       SetPagePrivate(page);
-       set_page_private(page, (unsigned long)wr);
-       get_page(page);
+       attach_page_private(page, wr);
 okay:
        return 0;
 }
@@ -459,18 +452,12 @@ static void orangefs_invalidatepage(struct page *page,
        wr = (struct orangefs_write_range *)page_private(page);
 
        if (offset == 0 && length == PAGE_SIZE) {
-               kfree((struct orangefs_write_range *)page_private(page));
-               set_page_private(page, 0);
-               ClearPagePrivate(page);
-               put_page(page);
+               kfree(detach_page_private(page));
                return;
        /* write range entirely within invalidate range (or equal) */
        } else if (page_offset(page) + offset <= wr->pos &&
            wr->pos + wr->len <= page_offset(page) + offset + length) {
-               kfree((struct orangefs_write_range *)page_private(page));
-               set_page_private(page, 0);
-               ClearPagePrivate(page);
-               put_page(page);
+               kfree(detach_page_private(page));
                /* XXX is this right? only caller in fs */
                cancel_dirty_page(page);
                return;
@@ -535,12 +522,7 @@ static int orangefs_releasepage(struct page *page, gfp_t foo)
 
 static void orangefs_freepage(struct page *page)
 {
-       if (PagePrivate(page)) {
-               kfree((struct orangefs_write_range *)page_private(page));
-               set_page_private(page, 0);
-               ClearPagePrivate(page);
-               put_page(page);
-       }
+       kfree(detach_page_private(page));
 }
 
 static int orangefs_launder_page(struct page *page)
@@ -740,9 +722,7 @@ vm_fault_t orangefs_page_mkwrite(struct vm_fault *vmf)
        wr->len = PAGE_SIZE;
        wr->uid = current_fsuid();
        wr->gid = current_fsgid();
-       SetPagePrivate(page);
-       set_page_private(page, (unsigned long)wr);
-       get_page(page);
+       attach_page_private(page, wr);
 okay:
 
        file_update_time(vmf->vma->vm_file);
@@ -875,13 +855,13 @@ again:
                ORANGEFS_I(inode)->attr_uid = current_fsuid();
                ORANGEFS_I(inode)->attr_gid = current_fsgid();
        }
-       setattr_copy(inode, iattr);
+       setattr_copy(&init_user_ns, inode, iattr);
        spin_unlock(&inode->i_lock);
        mark_inode_dirty(inode);
 
        if (iattr->ia_valid & ATTR_MODE)
                /* change mod on a file that has ACLs */
-               ret = posix_acl_chmod(inode, inode->i_mode);
+               ret = posix_acl_chmod(&init_user_ns, inode, inode->i_mode);
 
        ret = 0;
 out:
@@ -891,12 +871,13 @@ out:
 /*
  * Change attributes of an object referenced by dentry.
  */
-int orangefs_setattr(struct dentry *dentry, struct iattr *iattr)
+int orangefs_setattr(struct user_namespace *mnt_userns, struct dentry *dentry,
+                    struct iattr *iattr)
 {
        int ret;
        gossip_debug(GOSSIP_INODE_DEBUG, "__orangefs_setattr: called on %pd\n",
            dentry);
-       ret = setattr_prepare(dentry, iattr);
+       ret = setattr_prepare(&init_user_ns, dentry, iattr);
        if (ret)
                goto out;
        ret = __orangefs_setattr(d_inode(dentry), iattr);
@@ -910,8 +891,8 @@ out:
 /*
  * Obtain attributes of an object given a dentry
  */
-int orangefs_getattr(const struct path *path, struct kstat *stat,
-                    u32 request_mask, unsigned int flags)
+int orangefs_getattr(struct user_namespace *mnt_userns, const struct path *path,
+                    struct kstat *stat, u32 request_mask, unsigned int flags)
 {
        int ret;
        struct inode *inode = path->dentry->d_inode;
@@ -923,7 +904,7 @@ int orangefs_getattr(const struct path *path, struct kstat *stat,
        ret = orangefs_inode_getattr(inode,
            request_mask & STATX_SIZE ? ORANGEFS_GETATTR_SIZE : 0);
        if (ret == 0) {
-               generic_fillattr(inode, stat);
+               generic_fillattr(&init_user_ns, inode, stat);
 
                /* override block size reported to stat */
                if (!(request_mask & STATX_SIZE))
@@ -939,7 +920,8 @@ int orangefs_getattr(const struct path *path, struct kstat *stat,
        return ret;
 }
 
-int orangefs_permission(struct inode *inode, int mask)
+int orangefs_permission(struct user_namespace *mnt_userns,
+                       struct inode *inode, int mask)
 {
        int ret;
 
@@ -953,7 +935,7 @@ int orangefs_permission(struct inode *inode, int mask)
        if (ret < 0)
                return ret;
 
-       return generic_permission(inode, mask);
+       return generic_permission(&init_user_ns, inode, mask);
 }
 
 int orangefs_update_time(struct inode *inode, struct timespec64 *time, int flags)