Skip to contentSkip to conversation

mm: remove the unused gfp arg to shmem_add_to_page_cache

PATCH In review Wang Sheng-Hui 2 participants 2 messages Jul 14, 2014 – Jul 15, 2014

Subsystems (2)
Memory management tmpfs (shmem filesystem)
lore
Share & tools
lore

Wang Sheng-Hui

author
#0 lore raw

PATCH 1/1 mm: remove the unused gfp arg to shmem_add_to_page_cache

The gfp arg is not used in shmem_add_to_page_cache. Remove this unused arg.

Signed-off-by Wang Sheng-Hui <[email protected]>
---
 mm/shmem.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
mm/shmem.c +4 -4
index 1140f49..63cc6af 100644
@@ -280,7 +280,7 @@ static bool shmem_confirm_swap(struct address_space *mapping,
  */
 static int shmem_add_to_page_cache(struct page *page,
                                   struct address_space *mapping,
-                                  pgoff_t index, gfp_t gfp, void *expected)
+                                  pgoff_t index, void *expected)
 {
        int error;
 

@@ -643,7 +643,7 @@ static int shmem_unuse_inode(struct shmem_inode_info *info,
         */
        if (!error)
                error = shmem_add_to_page_cache(*pagep, mapping, index,
-                                               GFP_NOWAIT, radswap);
+                                               radswap);
        if (error != -ENOMEM) {
                /*
                 * Truncation and eviction use free_swap_and_cache(), which

@@ -1089,7 +1089,7 @@ repeat:
                                                gfp & GFP_RECLAIM_MASK);
                if (!error) {
                        error = shmem_add_to_page_cache(page, mapping, index,
-                                               gfp, swp_to_radix_entry(swap));
+                                               swp_to_radix_entry(swap));
                        /*
                         * We already confirmed swap under page lock, and make
                         * no memory allocation here, so usually no possibility

@@ -1152,7 +1152,7 @@ repeat:
                error = radix_tree_maybe_preload(gfp & GFP_RECLAIM_MASK);
                if (!error) {
                        error = shmem_add_to_page_cache(page, mapping, index,
-                                                       gfp, NULL);
+                                                       NULL);
                        radix_tree_preload_end();
                }
                if (error) {
Signature · 7 lines
1.8.3.2

--
To unsubscribe, send a message with 'unsubscribe linux-mm' in
the body to [email protected].  For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"[email protected]"> [email protected] </a>
maintainer
#1 lore raw
Quoted 5 lines · Wang Sheng-Hui

The gfp arg is not used in shmem_add_to_page_cache. Remove this unused arg.

Signed-off-by Wang Sheng-Hui <[email protected]>

Looks right, but checkpatch.pl has some complaints about the spaces:
please fix those. Maybe you started off with tabs, and gmail turned them into spaces. gmail is an outstandingly excellent mailer (;) but unhelpful on patches. See Documentation/email-clients.txt or Documentation/zh_CN/email-clients.txt. Maybe "git send-email" will get around it for you.

Thanks,
Hugh

Quoted 46 lines
---
 mm/shmem.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
mm/shmem.c +4 -4
index 1140f49..63cc6af 100644
@@ -280,7 +280,7 @@ static bool shmem_confirm_swap(struct address_space *mapping,
  */
 static int shmem_add_to_page_cache(struct page *page,
                                   struct address_space *mapping,
-                                  pgoff_t index, gfp_t gfp, void *expected)
+                                  pgoff_t index, void *expected)
 {
        int error;
 

@@ -643,7 +643,7 @@ static int shmem_unuse_inode(struct shmem_inode_info *info,
         */
        if (!error)
                error = shmem_add_to_page_cache(*pagep, mapping, index,
-                                               GFP_NOWAIT, radswap);
+                                               radswap);
        if (error != -ENOMEM) {
                /*
                 * Truncation and eviction use free_swap_and_cache(), which

@@ -1089,7 +1089,7 @@ repeat:
                                                gfp & GFP_RECLAIM_MASK);
                if (!error) {
                        error = shmem_add_to_page_cache(page, mapping, index,
-                                               gfp, swp_to_radix_entry(swap));
+                                               swp_to_radix_entry(swap));
                        /*
                         * We already confirmed swap under page lock, and make
                         * no memory allocation here, so usually no possibility

@@ -1152,7 +1152,7 @@ repeat:
                error = radix_tree_maybe_preload(gfp & GFP_RECLAIM_MASK);
                if (!error) {
                        error = shmem_add_to_page_cache(page, mapping, index,
-                                                       gfp, NULL);
+                                                       NULL);
                        radix_tree_preload_end();
                }
                if (error) {
Signature · 1 line
1.8.3.2

--
To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to [email protected]. For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"[email protected]"> [email protected] </a>