[PATCH 21/35] fs-tests: integck: teach symlink_remove return error on removal failure
Artem Bityutskiy
dedekind1 at gmail.com
Wed Apr 20 06:18:54 EDT 2011
From: Artem Bityutskiy <Artem.Bityutskiy at nokia.com>
When 'symlink_remove()' fails to unling a symlink - return an error to
the calling function.
Signed-off-by: Artem Bityutskiy <Artem.Bityutskiy at nokia.com>
---
tests/fs-tests/integrity/integck.c | 14 +++++++++-----
1 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/tests/fs-tests/integrity/integck.c b/tests/fs-tests/integrity/integck.c
index f56ff66..a486229 100644
--- a/tests/fs-tests/integrity/integck.c
+++ b/tests/fs-tests/integrity/integck.c
@@ -482,7 +482,7 @@ static int dir_new(struct dir_info *parent, const char *name)
static int file_delete(struct file_info *file);
static int file_unlink(struct dir_entry_info *entry);
-static void symlink_remove(struct symlink_info *symlink);
+static int symlink_remove(struct symlink_info *symlink);
static void dir_remove(struct dir_info *dir)
{
@@ -1851,16 +1851,20 @@ static int symlink_new(struct dir_info *dir, const char *nm)
return 0;
}
-static void symlink_remove(struct symlink_info *symlink)
+static int symlink_remove(struct symlink_info *symlink)
{
char *path;
path = dir_path(symlink->entry->parent, symlink->entry->name);
+ if (unlink(path) != 0) {
+ pcv("cannot unlink symlink %s", path);
+ free(path);
+ return -1;
+ }
remove_dir_entry(symlink->entry);
-
- CHECK(unlink(path) == 0);
free(path);
+ return 0;
}
static int operate_on_dir(struct dir_info *dir);
@@ -1915,7 +1919,7 @@ static int operate_on_entry(struct dir_entry_info *entry)
symlink_check(entry->symlink);
/* If shrinking, 1 time in 50, remove a symlink */
if (shrink && random_no(50) == 0)
- symlink_remove(entry->symlink);
+ return symlink_remove(entry->symlink);
return 0;
}
if (entry->type == 'd') {
--
1.7.2.3
More information about the linux-mtd
mailing list