To get name of the file from a pathname let's use kbasename() helper. It allows
to simplify code a bit.

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: Josef Bacik <jbacik@fusionio.com>
Signed-off-by: Chris Mason <chris.mason@fusionio.com>
This commit is contained in:
Andy Shevchenko 2013-08-21 10:32:13 +03:00 коммит произвёл Chris Mason
Родитель e57138b3e9
Коммит ed84885d1e
1 изменённых файлов: 6 добавлений и 12 удалений

Просмотреть файл

@ -26,6 +26,7 @@
#include <linux/radix-tree.h> #include <linux/radix-tree.h>
#include <linux/crc32c.h> #include <linux/crc32c.h>
#include <linux/vmalloc.h> #include <linux/vmalloc.h>
#include <linux/string.h>
#include "send.h" #include "send.h"
#include "backref.h" #include "backref.h"
@ -2601,7 +2602,6 @@ static int record_ref(struct list_head *head, u64 dir,
u64 dir_gen, struct fs_path *path) u64 dir_gen, struct fs_path *path)
{ {
struct recorded_ref *ref; struct recorded_ref *ref;
char *tmp;
ref = kmalloc(sizeof(*ref), GFP_NOFS); ref = kmalloc(sizeof(*ref), GFP_NOFS);
if (!ref) if (!ref)
@ -2611,20 +2611,14 @@ static int record_ref(struct list_head *head, u64 dir,
ref->dir_gen = dir_gen; ref->dir_gen = dir_gen;
ref->full_path = path; ref->full_path = path;
tmp = strrchr(ref->full_path->start, '/'); ref->name = (char *)kbasename(ref->full_path->start);
if (!tmp) { ref->name_len = ref->full_path->end - ref->name;
ref->name_len = ref->full_path->end - ref->full_path->start; ref->dir_path = ref->full_path->start;
ref->name = ref->full_path->start; if (ref->name == ref->full_path->start)
ref->dir_path_len = 0; ref->dir_path_len = 0;
ref->dir_path = ref->full_path->start; else
} else {
tmp++;
ref->name_len = ref->full_path->end - tmp;
ref->name = tmp;
ref->dir_path = ref->full_path->start;
ref->dir_path_len = ref->full_path->end - ref->dir_path_len = ref->full_path->end -
ref->full_path->start - 1 - ref->name_len; ref->full_path->start - 1 - ref->name_len;
}
list_add_tail(&ref->list, head); list_add_tail(&ref->list, head);
return 0; return 0;