Merge tag 'mm-stable-2022-08-03' of git://git.kernel.org/pub/scm/linux/kernel/git...

[linux-2.6-microblaze.git] / mm / shmem.c

diff --git a/mm/shmem.c b/mm/shmem.c
index e5e43b9..e975fcd 100644 (file)
--- a/mm/shmem.c
+++ b/mm/shmem.c
@@ -28,6 +28,7 @@
 #include <linux/ramfs.h>
 #include <linux/pagemap.h>
 #include <linux/file.h>
+#include <linux/fileattr.h>
 #include <linux/mm.h>
 #include <linux/random.h>
 #include <linux/sched/signal.h>
@@ -1057,6 +1058,15 @@ static int shmem_getattr(struct user_namespace *mnt_userns,
                shmem_recalc_inode(inode);
                spin_unlock_irq(&info->lock);
        }
+       if (info->fsflags & FS_APPEND_FL)
+               stat->attributes |= STATX_ATTR_APPEND;
+       if (info->fsflags & FS_IMMUTABLE_FL)
+               stat->attributes |= STATX_ATTR_IMMUTABLE;
+       if (info->fsflags & FS_NODUMP_FL)
+               stat->attributes |= STATX_ATTR_NODUMP;
+       stat->attributes_mask |= (STATX_ATTR_APPEND |
+                       STATX_ATTR_IMMUTABLE |
+                       STATX_ATTR_NODUMP);
        generic_fillattr(&init_user_ns, inode, stat);
 
        if (shmem_is_huge(NULL, inode, 0))
@@ -1690,7 +1700,7 @@ static void shmem_set_folio_swapin_error(struct inode *inode, pgoff_t index,
                return;
 
        folio_wait_writeback(folio);
-       delete_from_swap_cache(&folio->page);
+       delete_from_swap_cache(folio);
        spin_lock_irq(&info->lock);
        /*
         * Don't treat swapin error folio as alloced. Otherwise inode->i_blocks won't
@@ -1705,10 +1715,10 @@ static void shmem_set_folio_swapin_error(struct inode *inode, pgoff_t index,
 }
 
 /*
- * Swap in the page pointed to by *pagep.
- * Caller has to make sure that *pagep contains a valid swapped page.
- * Returns 0 and the page in pagep if success. On failure, returns the
- * error code and NULL in *pagep.
+ * Swap in the folio pointed to by *foliop.
+ * Caller has to make sure that *foliop contains a valid swapped folio.
+ * Returns 0 and the folio in foliop if success. On failure, returns the
+ * error code and NULL in *foliop.
  */
 static int shmem_swapin_folio(struct inode *inode, pgoff_t index,
                             struct folio **foliop, enum sgp_type sgp,
@@ -1748,7 +1758,7 @@ static int shmem_swapin_folio(struct inode *inode, pgoff_t index,
        }
        folio = page_folio(page);
 
-       /* We have to do this with page locked to prevent races */
+       /* We have to do this with folio locked to prevent races */
        folio_lock(folio);
        if (!folio_test_swapcache(folio) ||
            folio_swap_entry(folio).val != swap.val ||
@@ -1788,7 +1798,7 @@ static int shmem_swapin_folio(struct inode *inode, pgoff_t index,
        if (sgp == SGP_WRITE)
                folio_mark_accessed(folio);
 
-       delete_from_swap_cache(&folio->page);
+       delete_from_swap_cache(folio);
        folio_mark_dirty(folio);
        swap_free(swap);
 
@@ -2271,7 +2281,18 @@ static int shmem_mmap(struct file *file, struct vm_area_struct *vma)
        return 0;
 }
 
-static struct inode *shmem_get_inode(struct super_block *sb, const struct inode *dir,
+/* Mask out flags that are inappropriate for the given type of inode. */
+static unsigned shmem_mask_flags(umode_t mode, __u32 flags)
+{
+       if (S_ISDIR(mode))
+               return flags;
+       else if (S_ISREG(mode))
+               return flags & SHMEM_REG_FLMASK;
+       else
+               return flags & SHMEM_OTHER_FLMASK;
+}
+
+static struct inode *shmem_get_inode(struct super_block *sb, struct inode *dir,
                                     umode_t mode, dev_t dev, unsigned long flags)
 {
        struct inode *inode;
@@ -2296,6 +2317,9 @@ static struct inode *shmem_get_inode(struct super_block *sb, const struct inode
                info->seals = F_SEAL_SEAL;
                info->flags = flags & VM_NORESERVE;
                info->i_crtime = inode->i_mtime;
+               info->fsflags = (dir == NULL) ? 0 :
+                       SHMEM_I(dir)->fsflags & SHMEM_FL_INHERITED;
+               info->fsflags = shmem_mask_flags(mode, info->fsflags);
                INIT_LIST_HEAD(&info->shrinklist);
                INIT_LIST_HEAD(&info->swaplist);
                simple_xattrs_init(&info->xattrs);
@@ -3137,6 +3161,40 @@ static const char *shmem_get_link(struct dentry *dentry,
 }
 
 #ifdef CONFIG_TMPFS_XATTR
+
+static int shmem_fileattr_get(struct dentry *dentry, struct fileattr *fa)
+{
+       struct shmem_inode_info *info = SHMEM_I(d_inode(dentry));
+
+       fileattr_fill_flags(fa, info->fsflags & SHMEM_FL_USER_VISIBLE);
+
+       return 0;
+}
+
+static int shmem_fileattr_set(struct user_namespace *mnt_userns,
+                             struct dentry *dentry, struct fileattr *fa)
+{
+       struct inode *inode = d_inode(dentry);
+       struct shmem_inode_info *info = SHMEM_I(inode);
+
+       if (fileattr_has_fsx(fa))
+               return -EOPNOTSUPP;
+
+       info->fsflags = (info->fsflags & ~SHMEM_FL_USER_MODIFIABLE) |
+               (fa->flags & SHMEM_FL_USER_MODIFIABLE);
+
+       inode->i_flags &= ~(S_APPEND | S_IMMUTABLE | S_NOATIME);
+       if (info->fsflags & FS_APPEND_FL)
+               inode->i_flags |= S_APPEND;
+       if (info->fsflags & FS_IMMUTABLE_FL)
+               inode->i_flags |= S_IMMUTABLE;
+       if (info->fsflags & FS_NOATIME_FL)
+               inode->i_flags |= S_NOATIME;
+
+       inode->i_ctime = current_time(inode);
+       return 0;
+}
+
 /*
  * Superblocks without xattr inode operations may get some security.* xattr
  * support from the LSM "for free". As soon as we have any other xattrs
@@ -3824,6 +3882,8 @@ static const struct inode_operations shmem_inode_operations = {
 #ifdef CONFIG_TMPFS_XATTR
        .listxattr      = shmem_listxattr,
        .set_acl        = simple_set_acl,
+       .fileattr_get   = shmem_fileattr_get,
+       .fileattr_set   = shmem_fileattr_set,
 #endif
 };
 
@@ -3843,6 +3903,8 @@ static const struct inode_operations shmem_dir_inode_operations = {
 #endif
 #ifdef CONFIG_TMPFS_XATTR
        .listxattr      = shmem_listxattr,
+       .fileattr_get   = shmem_fileattr_get,
+       .fileattr_set   = shmem_fileattr_set,
 #endif
 #ifdef CONFIG_TMPFS_POSIX_ACL
        .setattr        = shmem_setattr,