From patchwork Wed Apr 20 10:18:41 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Artem Bityutskiy X-Patchwork-Id: 92165 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from bombadil.infradead.org (bombadil.infradead.org [18.85.46.34]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 1897AB6FD8 for ; Wed, 20 Apr 2011 20:21:22 +1000 (EST) Received: from canuck.infradead.org ([2001:4978:20e::1]) by bombadil.infradead.org with esmtps (Exim 4.72 #1 (Red Hat Linux)) id 1QCUTC-0006va-1w; Wed, 20 Apr 2011 10:17:14 +0000 Received: from localhost ([127.0.0.1] helo=canuck.infradead.org) by canuck.infradead.org with esmtp (Exim 4.72 #1 (Red Hat Linux)) id 1QCUTA-0006F2-En; Wed, 20 Apr 2011 10:17:12 +0000 Received: from smtp.nokia.com ([147.243.1.47] helo=mgw-sa01.nokia.com) by canuck.infradead.org with esmtps (Exim 4.72 #1 (Red Hat Linux)) id 1QCURs-00064u-8F for linux-mtd@lists.infradead.org; Wed, 20 Apr 2011 10:16:00 +0000 Received: from nokia.com (localhost [127.0.0.1]) by mgw-sa01.nokia.com (Switch-3.4.3/Switch-3.4.3) with ESMTP id p3KAFlpG009474 for ; Wed, 20 Apr 2011 13:15:51 +0300 Received: from eru.research.nokia.com ([[172.21.24.121]]) by mgw-sa01.nokia.com with ESMTP id p3KAFTS1009198 ; Wed, 20 Apr 2011 13:15:33 +0300 From: Artem Bityutskiy To: MTD list Subject: [PATCH 08/35] fs-tests: integck: handle errors in file_delete Date: Wed, 20 Apr 2011 13:18:41 +0300 Message-Id: <1303294748-5492-9-git-send-email-dedekind1@gmail.com> X-Mailer: git-send-email 1.7.2.3 In-Reply-To: <1303294748-5492-1-git-send-email-dedekind1@gmail.com> References: <1303294748-5492-1-git-send-email-dedekind1@gmail.com> X-Nokia-AV: Clean X-CRM114-Version: 20090807-BlameThorstenAndJenny ( TRE 0.7.6 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20110420_061552_988715_DEC7E843 X-CRM114-Status: GOOD ( 16.67 ) X-Spam-Score: 3.4 (+++) X-Spam-Report: SpamAssassin version 3.3.1 on canuck.infradead.org summary: Content analysis details: (3.4 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, low trust [147.243.1.47 listed in list.dnswl.org] 0.0 FREEMAIL_FROM Sender email is freemail (dedekind1[at]gmail.com) 0.0 DKIM_ADSP_CUSTOM_MED No valid author signature, adsp_override is CUSTOM_MED 2.2 FREEMAIL_ENVFROM_END_DIGIT Envelope-from freemail username ends in digit (dedekind1[at]gmail.com) 0.0 RFC_ABUSE_POST Both abuse and postmaster missing on sender domain 1.2 NML_ADSP_CUSTOM_MED ADSP custom_med hit, and not from a mailing list Cc: Adrian Hunter X-BeenThere: linux-mtd@lists.infradead.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Linux MTD discussion mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: linux-mtd-bounces@lists.infradead.org Errors-To: linux-mtd-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org From: Artem Bityutskiy Teach 'file_delete()' and several other functions it calls (like 'file_unlink()) to handle write errors and propagate the up to the caller. Signed-off-by: Artem Bityutskiy --- tests/fs-tests/integrity/integck.c | 77 +++++++++++++++++++++++++----------- 1 files changed, 54 insertions(+), 23 deletions(-) diff --git a/tests/fs-tests/integrity/integck.c b/tests/fs-tests/integrity/integck.c index 06e33b5..7ccbcb1 100644 --- a/tests/fs-tests/integrity/integck.c +++ b/tests/fs-tests/integrity/integck.c @@ -476,8 +476,8 @@ static struct dir_info *dir_new(struct dir_info *parent, const char *name) return dir; } -static void file_delete(struct file_info *file); -static void file_unlink(struct dir_entry_info *entry); +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 void dir_remove(struct dir_info *dir) @@ -576,20 +576,28 @@ static void file_close_all(struct file_info *file) } } -static void file_unlink(struct dir_entry_info *entry) +/* + * Unlink a directory entry for a file. + */ +static int file_unlink(struct dir_entry_info *entry) { struct file_info *file = entry->file; char *path; + int ret; path = dir_path(entry->parent, entry->name); + /* Unlink the file */ + ret = unlink(path); + if (ret) { + pcv("cannot unlink file %s", path); + free(path); + return -1; + } + free(path); /* Remove file entry from parent directory */ remove_dir_entry(entry); - /* Unlink the file */ - CHECK(unlink(path) == 0); - free(path); - /* Free struct file_info if file is not open and not linked */ if (!file->fds && !file->links) { struct write_info *w, *next; @@ -604,6 +612,8 @@ static void file_unlink(struct dir_entry_info *entry) free(file); } else if (!file->links) file->deleted = 1; + + return 0; } static struct dir_entry_info *pick_entry(struct file_info *file) @@ -630,7 +640,11 @@ static void file_unlink_file(struct file_info *file) file_unlink(entry); } -static void file_delete(struct file_info *file) +/* + * Close all open descriptors for a file described by 'file' and delete it by + * unlinking all its hardlinks. + */ +static int file_delete(struct file_info *file) { struct dir_entry_info *entry = file->links; @@ -638,9 +652,12 @@ static void file_delete(struct file_info *file) while (entry) { struct dir_entry_info *next = entry->next_link; - file_unlink(entry); + if (file_unlink(entry)) + return -1; entry = next; } + + return 0; } static void file_info_display(struct file_info *file) @@ -892,7 +909,8 @@ static int file_ftruncate(struct file_info *file, int fd, off_t new_length) file->no_space_error = 1; /* Delete errored files */ if (!fsinfo.nospc_size_ok) - file_delete(file); + if (file_delete(file)) + return -1; return 1; } else pcv("cannot truncate file %s to %llu", @@ -970,17 +988,21 @@ static void file_mmap_write(struct file_info *file) file_write_info(file, offset, size, seed); } -static void file_write(struct file_info *file, int fd) +/* + * Write random amount of data to a random offset in an open file or randomly + * choose to truncate it. + */ +static int file_write(struct file_info *file, int fd) { off_t offset; size_t size, actual; unsigned seed; - int truncate = 0; + int ret, truncate = 0; if (fsinfo.can_mmap && !full && !file->deleted && random_no(100) == 1) { file_mmap_write(file); - return; + return 0; } get_offset_and_size(file, &offset, &size); @@ -997,30 +1019,38 @@ static void file_write(struct file_info *file, int fd) file_write_info(file, offset, actual, seed); /* Delete errored files */ - if (!fsinfo.nospc_size_ok && file->no_space_error) { - file_delete(file); - return; - } + if (!fsinfo.nospc_size_ok && file->no_space_error) + return file_delete(file); if (truncate) { size_t new_length = offset + actual; - if (!file_ftruncate(file, fd, new_length)) + ret = file_ftruncate(file, fd, new_length); + if (ret == -1) + return -1; + if (!ret) file_truncate_info(file, new_length); } + + return 0; } -static void file_write_file(struct file_info *file) +/* + * Write random amount of data to a random offset in a file or randomly + * choose to truncate it. + */ +static int file_write_file(struct file_info *file) { - int fd; + int fd, ret; char *path; path = dir_path(file->links->parent, file->links->name); fd = open(path, O_WRONLY); CHECK(fd != -1); - file_write(file, fd); + ret = file_write(file, fd); CHECK(close(fd) == 0); free(path); + return ret; } static void file_truncate_info(struct file_info *file, size_t new_length) @@ -1924,9 +1954,10 @@ static int operate_on_open_file(struct fd_info *fdi) else if (r < 21) file_close(fdi); else if (shrink && r < 121 && !fdi->file->deleted) - file_delete(fdi->file); + return file_delete(fdi->file); else { - file_write(fdi->file, fdi->fd); + if (file_write(fdi->file, fdi->fd)) + return -1; if (r >= 999) { if (random_no(100) >= 50) CHECK(fsync(fdi->fd) == 0);