diff options
| author | Benjamin Randazzo <benjamin@randazzo.fr> | 2015-07-25 16:36:50 +0200 |
|---|---|---|
| committer | NeilBrown <neilb@suse.com> | 2015-08-03 09:12:44 +0200 |
| commit | 25eafe1a813681849ad3fb9effdfdce3e1b4335a (patch) | |
| tree | de118361423a3140511be6c5aa820c6d482f1260 /drivers/md | |
| parent | md/raid5: don't let shrink_slab shrink too far. (diff) | |
| download | linux-25eafe1a813681849ad3fb9effdfdce3e1b4335a.tar.xz linux-25eafe1a813681849ad3fb9effdfdce3e1b4335a.zip | |
md: simplify get_bitmap_file now that "file" is zeroed.
There is no point assigning '\0' to file->pathname[0] as
file is now zeroed out, so remove that branch and
simplify the code.
[Original patch combined this with the change to use
kzalloc. I split the two so that the change to kzalloc
is easier to backport. - neilb]
Signed-off-by: Benjamin Randazzo <benjamin@randazzo.fr>
Signed-off-by: NeilBrown <neilb@suse.com>
Diffstat (limited to 'drivers/md')
| -rw-r--r-- | drivers/md/md.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/drivers/md/md.c b/drivers/md/md.c index e25f00f0138a..4d47a9ab8228 100644 --- a/drivers/md/md.c +++ b/drivers/md/md.c @@ -5765,16 +5765,16 @@ static int get_bitmap_file(struct mddev *mddev, void __user * arg) err = 0; spin_lock(&mddev->lock); - /* bitmap disabled, zero the first byte and copy out */ - if (!mddev->bitmap_info.file) - file->pathname[0] = '\0'; - else if ((ptr = file_path(mddev->bitmap_info.file, - file->pathname, sizeof(file->pathname))), - IS_ERR(ptr)) - err = PTR_ERR(ptr); - else - memmove(file->pathname, ptr, - sizeof(file->pathname)-(ptr-file->pathname)); + /* bitmap enabled */ + if (mddev->bitmap_info.file) { + ptr = file_path(mddev->bitmap_info.file, file->pathname, + sizeof(file->pathname)); + if (IS_ERR(ptr)) + err = PTR_ERR(ptr); + else + memmove(file->pathname, ptr, + sizeof(file->pathname)-(ptr-file->pathname)); + } spin_unlock(&mddev->lock); if (err == 0 && |