btrfs: reuse kbasename helper

PATCH Superseded Andy Shevchenko 2 participants 2 messages Aug 12, 2013 – Aug 20, 2013 Btrfs file system

lore

Share & tools

lore

Andy Shevchenko

author

2013-08-12 11:41 UTC #0 lore raw

PATCH 1/1 btrfs: reuse kbasename helper

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 <[email protected]>

---
 fs/btrfs/send.c | 17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)

fs/btrfs/send.c +6 ~~-11~~

index d3f3b43..4fdc99d 100644
@@ -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"

@@ -2591,20 +2592,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 = 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;

Signature · 1 line

1.8.4.rc1

Josef Bacik

2013-08-20 18:48 UTC #1 lore raw

Quoted 4 lines · Andy Shevchenko

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 <[email protected]>

Introduces a compile error

fs/btrfs/send.c: In function ‘record_ref’:
fs/btrfs/send.c:2615:12: warning: assignment discards ‘const’ qualifier from pointer target type [enabled by default]
fs/btrfs/send.c:2605:8: warning: unused variable ‘tmp’ [-Wunused-variable]

Thanks,

Josef