[PATCH 23/35] fs-tests: integck: teach file_unlink_file return an error
Artem Bityutskiy
dedekind1 at gmail.com
Wed Apr 20 06:18:56 EDT 2011
From: Artem Bityutskiy <Artem.Bityutskiy at nokia.com>
Teach 'file_unlink_file()' return an error to the caller if the
file cannot be unlinked.
Signed-off-by: Artem Bityutskiy <Artem.Bityutskiy at nokia.com>
---
tests/fs-tests/integrity/integck.c | 18 +++++++-----------
1 files changed, 7 insertions(+), 11 deletions(-)
diff --git a/tests/fs-tests/integrity/integck.c b/tests/fs-tests/integrity/integck.c
index 9ab417d..f99caae 100644
--- a/tests/fs-tests/integrity/integck.c
+++ b/tests/fs-tests/integrity/integck.c
@@ -652,14 +652,14 @@ static struct dir_entry_info *pick_entry(struct file_info *file)
return entry;
}
-static void file_unlink_file(struct file_info *file)
+static int file_unlink_file(struct file_info *file)
{
struct dir_entry_info *entry;
entry = pick_entry(file);
if (!entry)
- return;
- file_unlink(entry);
+ return 0;
+ return file_unlink(entry);
}
/*
@@ -1941,16 +1941,12 @@ static int operate_on_entry(struct dir_entry_info *entry)
}
if (entry->type == 'f') {
/* If shrinking, 1 time in 10, remove a file */
- if (shrink && random_no(10) == 0) {
- file_delete(entry->file);
- return 0;
- }
+ if (shrink && random_no(10) == 0)
+ return file_delete(entry->file);
/* If not growing, 1 time in 10, unlink a file with links > 1 */
if (!grow && entry->file->link_count > 1 &&
- random_no(10) == 0) {
- file_unlink_file(entry->file);
- return 0;
- }
+ random_no(10) == 0)
+ return file_unlink_file(entry->file);
operate_on_file(entry->file);
}
return 0;
--
1.7.2.3
More information about the linux-mtd
mailing list