Skip to content

Commit

Permalink
btrfs: reuse kbasename helper
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Andy Shevchenko authored and Chris Mason committed Sep 1, 2013
1 parent e57138b commit ed84885
Showing 1 changed file with 6 additions and 12 deletions.
18 changes: 6 additions & 12 deletions fs/btrfs/send.c
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
#include <linux/radix-tree.h>
#include <linux/crc32c.h>
#include <linux/vmalloc.h>
#include <linux/string.h>

#include "send.h"
#include "backref.h"
Expand Down Expand Up @@ -2601,7 +2602,6 @@ static int record_ref(struct list_head *head, u64 dir,
u64 dir_gen, struct fs_path *path)
{
struct recorded_ref *ref;
char *tmp;

ref = kmalloc(sizeof(*ref), GFP_NOFS);
if (!ref)
Expand All @@ -2611,20 +2611,14 @@ static int record_ref(struct list_head *head, u64 dir,
ref->dir_gen = dir_gen;
ref->full_path = path;

tmp = strrchr(ref->full_path->start, '/');
if (!tmp) {
ref->name_len = ref->full_path->end - ref->full_path->start;
ref->name = ref->full_path->start;
ref->name = (char *)kbasename(ref->full_path->start);
ref->name_len = ref->full_path->end - ref->name;
ref->dir_path = ref->full_path->start;
if (ref->name == ref->full_path->start)
ref->dir_path_len = 0;
ref->dir_path = ref->full_path->start;
} else {
tmp++;
ref->name_len = ref->full_path->end - tmp;
ref->name = tmp;
ref->dir_path = ref->full_path->start;
else
ref->dir_path_len = ref->full_path->end -
ref->full_path->start - 1 - ref->name_len;
}

list_add_tail(&ref->list, head);
return 0;
Expand Down

0 comments on commit ed84885

Please sign in to comment.