diff options
| author | Rasmus Villemoes <linux@rasmusvillemoes.dk> | 2015-11-27 09:42:11 +0100 |
|---|---|---|
| committer | David Sterba <dsterba@suse.com> | 2016-03-11 16:55:52 +0100 |
| commit | 02def69fae9298331684a2782b91c14362936fe8 (patch) | |
| tree | dcf662f9a43bf9fbb77845b9171ad376c5a56bb1 /fs/btrfs/check-integrity.c | |
| parent | 5e33a2bd7ca7fa687fb0965869196eea6815d1f3 (diff) | |
| download | lwn-02def69fae9298331684a2782b91c14362936fe8.tar.gz lwn-02def69fae9298331684a2782b91c14362936fe8.zip | |
btrfs: use kbasename in btrfsic_mount
This is more readable.
Signed-off-by: Rasmus Villemoes <linux@rasmusvillemoes.dk>
Reviewed-by Andy Shevchenko <andy.shevchenko@gmail.com>
Signed-off-by: David Sterba <dsterba@suse.com>
Diffstat (limited to 'fs/btrfs/check-integrity.c')
| -rw-r--r-- | fs/btrfs/check-integrity.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/fs/btrfs/check-integrity.c b/fs/btrfs/check-integrity.c index 861d472564c1..60fc45f3a361 100644 --- a/fs/btrfs/check-integrity.c +++ b/fs/btrfs/check-integrity.c @@ -95,6 +95,7 @@ #include <linux/genhd.h> #include <linux/blkdev.h> #include <linux/vmalloc.h> +#include <linux/string.h> #include "ctree.h" #include "disk-io.h" #include "hash.h" @@ -3076,7 +3077,7 @@ int btrfsic_mount(struct btrfs_root *root, list_for_each_entry(device, dev_head, dev_list) { struct btrfsic_dev_state *ds; - char *p; + const char *p; if (!device->bdev || !device->name) continue; @@ -3092,11 +3093,7 @@ int btrfsic_mount(struct btrfs_root *root, ds->state = state; bdevname(ds->bdev, ds->name); ds->name[BDEVNAME_SIZE - 1] = '\0'; - for (p = ds->name; *p != '\0'; p++); - while (p > ds->name && *p != '/') - p--; - if (*p == '/') - p++; + p = kbasename(ds->name); strlcpy(ds->name, p, sizeof(ds->name)); btrfsic_dev_state_hashtable_add(ds, &btrfsic_dev_state_hashtable); |