Re: [PATCH 1/5] btrfs: replace opencoded kvzalloc with the helper

[David Sterba]

On Thu, Jun 01, 2017 at 04:04:47PM +0800, Anand Jain wrote:
> 
> 
> 
> > diff --git a/fs/btrfs/send.c b/fs/btrfs/send.c
> > index e8185c83f667..924b1d941b53 100644
> > --- a/fs/btrfs/send.c
> > +++ b/fs/btrfs/send.c
> > @@ -6389,13 +6389,10 @@ long btrfs_ioctl_send(struct file *mnt_file, void 
> > __user *arg_)
> >
> > alloc_size = sizeof(struct clone_root) * (arg->clone_sources_count + 1);
> >
> > -   sctx->clone_roots = kzalloc(alloc_size, GFP_KERNEL | __GFP_NOWARN);
> > +   sctx->clone_roots = kzalloc(alloc_size, GFP_KERNEL);
> 
> 
>   Should be kvzalloc ?

Of course, I'll fix it. Thanks.
--
To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH 1/5] btrfs: replace opencoded kvzalloc with the helper

[Anand Jain]

diff --git a/fs/btrfs/send.c b/fs/btrfs/send.c
index e8185c83f667..924b1d941b53 100644
--- a/fs/btrfs/send.c
+++ b/fs/btrfs/send.c
@@ -6389,13 +6389,10 @@ long btrfs_ioctl_send(struct file *mnt_file, void 
__user *arg_)

alloc_size = sizeof(struct clone_root) * (arg->clone_sources_count + 1);

-   sctx->clone_roots = kzalloc(alloc_size, GFP_KERNEL | __GFP_NOWARN);
+   sctx->clone_roots = kzalloc(alloc_size, GFP_KERNEL);



 Should be kvzalloc ?

Thanks, Anand



if (!sctx->clone_roots) {
-   sctx->clone_roots = vzalloc(alloc_size);
-   if (!sctx->clone_roots) {
-   ret = -ENOMEM;
-   goto out;
-   }
+   ret = -ENOMEM;
+   goto out;
}

alloc_size = arg->clone_sources_count * sizeof(*arg->clone_sources);


--
To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[PATCH 1/5] btrfs: replace opencoded kvzalloc with the helper

[David Sterba]

The logic of kmalloc and vmalloc fallback is open coded in
several places, we can now use the existing helper.

Signed-off-by: David Sterba 
---
 fs/btrfs/check-integrity.c | 11 ---
 fs/btrfs/raid56.c  | 11 ---
 fs/btrfs/send.c|  9 +++--
 3 files changed, 11 insertions(+), 20 deletions(-)

diff --git a/fs/btrfs/check-integrity.c b/fs/btrfs/check-integrity.c
index 6cabc8acee2a..5f8006e4de9d 100644
--- a/fs/btrfs/check-integrity.c
+++ b/fs/btrfs/check-integrity.c
@@ -94,7 +94,7 @@
 #include 
 #include 
 #include 
-#include 
+#include 
 #include 
 #include "ctree.h"
 #include "disk-io.h"
@@ -2920,13 +2920,10 @@ int btrfsic_mount(struct btrfs_fs_info *fs_info,
   fs_info->sectorsize, PAGE_SIZE);
return -1;
}
-   state = kzalloc(sizeof(*state), GFP_KERNEL | __GFP_NOWARN | 
__GFP_REPEAT);
+   state = kvzalloc(sizeof(*state), GFP_KERNEL);
if (!state) {
-   state = vzalloc(sizeof(*state));
-   if (!state) {
-   pr_info("btrfs check-integrity: vzalloc() failed!\n");
-   return -1;
-   }
+   pr_info("btrfs check-integrity: allocation failed!\n");
+   return -1;
}
 
if (!btrfsic_is_initialized) {
diff --git a/fs/btrfs/raid56.c b/fs/btrfs/raid56.c
index d8ea0eb76325..d68af3c61b49 100644
--- a/fs/btrfs/raid56.c
+++ b/fs/btrfs/raid56.c
@@ -31,7 +31,7 @@
 #include 
 #include 
 #include 
-#include 
+#include 
 #include 
 #include "ctree.h"
 #include "extent_map.h"
@@ -218,12 +218,9 @@ int btrfs_alloc_stripe_hash_table(struct btrfs_fs_info 
*info)
 * of a failing mount.
 */
table_size = sizeof(*table) + sizeof(*h) * num_entries;
-   table = kzalloc(table_size, GFP_KERNEL | __GFP_NOWARN | __GFP_REPEAT);
-   if (!table) {
-   table = vzalloc(table_size);
-   if (!table)
-   return -ENOMEM;
-   }
+   table = kvzalloc(table_size, GFP_KERNEL);
+   if (!table)
+   return -ENOMEM;
 
spin_lock_init(>cache_lock);
INIT_LIST_HEAD(>stripe_cache);
diff --git a/fs/btrfs/send.c b/fs/btrfs/send.c
index e8185c83f667..924b1d941b53 100644
--- a/fs/btrfs/send.c
+++ b/fs/btrfs/send.c
@@ -6389,13 +6389,10 @@ long btrfs_ioctl_send(struct file *mnt_file, void 
__user *arg_)
 
alloc_size = sizeof(struct clone_root) * (arg->clone_sources_count + 1);
 
-   sctx->clone_roots = kzalloc(alloc_size, GFP_KERNEL | __GFP_NOWARN);
+   sctx->clone_roots = kzalloc(alloc_size, GFP_KERNEL);
if (!sctx->clone_roots) {
-   sctx->clone_roots = vzalloc(alloc_size);
-   if (!sctx->clone_roots) {
-   ret = -ENOMEM;
-   goto out;
-   }
+   ret = -ENOMEM;
+   goto out;
}
 
alloc_size = arg->clone_sources_count * sizeof(*arg->clone_sources);
-- 
2.12.0

--
To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html