From patchwork Wed Apr 13 15:19:07 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Artem Bityutskiy X-Patchwork-Id: 91052 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 D46BDB70E2 for ; Thu, 14 Apr 2011 01:20: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 1QA1pu-00084l-IO; Wed, 13 Apr 2011 15:18:31 +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 1QA1pt-0003da-0y; Wed, 13 Apr 2011 15:18:29 +0000 Received: from smtp.nokia.com ([147.243.1.48] helo=mgw-sa02.nokia.com) by canuck.infradead.org with esmtps (Exim 4.72 #1 (Red Hat Linux)) id 1QA1nW-0003Uy-Lp for linux-mtd@lists.infradead.org; Wed, 13 Apr 2011 15:16:14 +0000 Received: from nokia.com (localhost [127.0.0.1]) by mgw-sa02.nokia.com (Switch-3.4.3/Switch-3.4.3) with ESMTP id p3DFFnRv018697 for ; Wed, 13 Apr 2011 18:16:01 +0300 Received: from eru.research.nokia.com ([[172.21.23.107]]) by mgw-sa02.nokia.com with ESMTP id p3DFFZwD018457 ; Wed, 13 Apr 2011 18:15:45 +0300 From: Artem Bityutskiy To: MTD list Subject: [PATCH 27/27] fs-tests: integck: do not expect max name length to be 256 Date: Wed, 13 Apr 2011 18:19:07 +0300 Message-Id: <1302707947-6143-28-git-send-email-dedekind1@gmail.com> X-Mailer: git-send-email 1.7.2.3 In-Reply-To: <1302707947-6143-1-git-send-email-dedekind1@gmail.com> References: <1302707947-6143-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-20110413_111603_383731_5C6B4BDF X-CRM114-Status: GOOD ( 13.48 ) 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.48 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) 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 The 'make_name()' function assumes that the maxumum file name length is 256 bytes, which is wrong. This patch fixes this. Signed-off-by: Artem Bityutskiy --- tests/fs-tests/integrity/integck.c | 21 ++++++++++++++------- 1 files changed, 14 insertions(+), 7 deletions(-) diff --git a/tests/fs-tests/integrity/integck.c b/tests/fs-tests/integrity/integck.c index 387874c..61fb12c 100644 --- a/tests/fs-tests/integrity/integck.c +++ b/tests/fs-tests/integrity/integck.c @@ -203,6 +203,11 @@ static uint64_t operation_count = 0; /* Number of operations used to fill static unsigned int check_run_no; /* + * A buffer which is used by 'make_name()' to return the generated random name. + */ +static char *random_name_buf; + +/* * Is this 'struct write_info' actually holds information about a truncation? */ static int is_truncation(struct write_info *w) @@ -1451,7 +1456,6 @@ static void close_open_files(void) static char *make_name(struct dir_info *dir) { - static char name[256]; struct dir_entry_info *entry; int found; @@ -1460,20 +1464,20 @@ static char *make_name(struct dir_info *dir) if (random_no(5) == 1) { int i, n = random_no(fsinfo.max_name_len) + 1; - CHECK(n > 0 && n < 256); for (i = 0; i < n; i++) - name[i] = 'a' + random_no(26); - name[i] = '\0'; + random_name_buf[i] = 'a' + random_no(26); + random_name_buf[i] = '\0'; } else - sprintf(name, "%u", random_no(1000000)); + sprintf(random_name_buf, "%u", random_no(1000000)); for (entry = dir->first; entry; entry = entry->next) { - if (strcmp(entry->name, name) == 0) { + if (strcmp(entry->name, random_name_buf) == 0) { found = 1; break; } } } while (found); - return name; + + return random_name_buf; } static struct file_info *pick_file(void) @@ -2417,6 +2421,9 @@ int main(int argc, char *argv[]) /* Seed the random generator with out PID */ srand(getpid()); + random_name_buf = malloc(fsinfo.max_name_len + 1); + CHECK(random_name_buf != NULL); + /* Do the actual test */ ret = integck(); if (ret)