Merge tag 'fuse-update-5.11' of git://git.kernel.org/pub/scm/linux/kernel/git/mszered...

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

diff --git a/mm/shmem.c b/mm/shmem.c
index 537c137..7c6b6d8 100644 (file)
--- a/mm/shmem.c
+++ b/mm/shmem.c
@@ -246,7 +246,7 @@ static inline void shmem_inode_unacct_blocks(struct inode *inode, long pages)
 }
 
 static const struct super_operations shmem_ops;
-static const struct address_space_operations shmem_aops;
+const struct address_space_operations shmem_aops;
 static const struct file_operations shmem_file_operations;
 static const struct inode_operations shmem_inode_operations;
 static const struct inode_operations shmem_dir_inode_operations;
@@ -713,7 +713,7 @@ next:
                }
                if (PageTransHuge(page)) {
                        count_vm_event(THP_FILE_ALLOC);
-                       __inc_node_page_state(page, NR_SHMEM_THPS);
+                       __inc_lruvec_page_state(page, NR_SHMEM_THPS);
                }
                mapping->nrpages += nr;
                __mod_lruvec_page_state(page, NR_FILE_PAGES, nr);
@@ -1152,7 +1152,7 @@ static void shmem_evict_inode(struct inode *inode)
        struct shmem_inode_info *info = SHMEM_I(inode);
        struct shmem_sb_info *sbinfo = SHMEM_SB(inode->i_sb);
 
-       if (inode->i_mapping->a_ops == &shmem_aops) {
+       if (shmem_mapping(inode->i_mapping)) {
                shmem_unacct_size(info->flags, inode->i_size);
                inode->i_size = 0;
                shmem_truncate_range(inode, 0, (loff_t)-1);
@@ -1858,7 +1858,7 @@ repeat:
        }
 
        /* shmem_symlink() */
-       if (mapping->a_ops != &shmem_aops)
+       if (!shmem_mapping(mapping))
                goto alloc_nohuge;
        if (shmem_huge == SHMEM_HUGE_DENY || sgp_huge == SGP_NOHUGE)
                goto alloc_nohuge;
@@ -2352,11 +2352,6 @@ static struct inode *shmem_get_inode(struct super_block *sb, const struct inode
        return inode;
 }
 
-bool shmem_mapping(struct address_space *mapping)
-{
-       return mapping->a_ops == &shmem_aops;
-}
-
 static int shmem_mfill_atomic_pte(struct mm_struct *dst_mm,
                                  pmd_t *dst_pmd,
                                  struct vm_area_struct *dst_vma,
@@ -3865,7 +3860,7 @@ static void shmem_destroy_inodecache(void)
        kmem_cache_destroy(shmem_inode_cachep);
 }
 
-static const struct address_space_operations shmem_aops = {
+const struct address_space_operations shmem_aops = {
        .writepage      = shmem_writepage,
        .set_page_dirty = __set_page_dirty_no_writeback,
 #ifdef CONFIG_TMPFS
@@ -3877,6 +3872,7 @@ static const struct address_space_operations shmem_aops = {
 #endif
        .error_remove_page = generic_error_remove_page,
 };
+EXPORT_SYMBOL(shmem_aops);
 
 static const struct file_operations shmem_file_operations = {
        .mmap           = shmem_mmap,
@@ -4024,7 +4020,7 @@ out2:
 
 #if defined(CONFIG_TRANSPARENT_HUGEPAGE) && defined(CONFIG_SYSFS)
 static ssize_t shmem_enabled_show(struct kobject *kobj,
-               struct kobj_attribute *attr, char *buf)
+                                 struct kobj_attribute *attr, char *buf)
 {
        static const int values[] = {
                SHMEM_HUGE_ALWAYS,
@@ -4034,16 +4030,19 @@ static ssize_t shmem_enabled_show(struct kobject *kobj,
                SHMEM_HUGE_DENY,
                SHMEM_HUGE_FORCE,
        };
-       int i, count;
-
-       for (i = 0, count = 0; i < ARRAY_SIZE(values); i++) {
-               const char *fmt = shmem_huge == values[i] ? "[%s] " : "%s ";
+       int len = 0;
+       int i;
 
-               count += sprintf(buf + count, fmt,
-                               shmem_format_huge(values[i]));
+       for (i = 0; i < ARRAY_SIZE(values); i++) {
+               len += sysfs_emit_at(buf, len,
+                                    shmem_huge == values[i] ? "%s[%s]" : "%s%s",
+                                    i ? " " : "",
+                                    shmem_format_huge(values[i]));
        }
-       buf[count - 1] = '\n';
-       return count;
+
+       len += sysfs_emit_at(buf, len, "\n");
+
+       return len;
 }
 
 static ssize_t shmem_enabled_store(struct kobject *kobj,
@@ -4312,7 +4311,7 @@ struct page *shmem_read_mapping_page_gfp(struct address_space *mapping,
        struct page *page;
        int error;
 
-       BUG_ON(mapping->a_ops != &shmem_aops);
+       BUG_ON(!shmem_mapping(mapping));
        error = shmem_getpage_gfp(inode, index, &page, SGP_CACHE,
                                  gfp, NULL, NULL, NULL);
        if (error)