From patchwork Fri Jan 24 12:55:35 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Martin Doucha X-Patchwork-Id: 1228819 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.linux.it (client-ip=213.254.12.146; helo=picard.linux.it; envelope-from=ltp-bounces+incoming=patchwork.ozlabs.org@lists.linux.it; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=suse.cz Received: from picard.linux.it (picard.linux.it [213.254.12.146]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 483zfP1RJLz9sNF for ; Fri, 24 Jan 2020 23:56:12 +1100 (AEDT) Received: from picard.linux.it (localhost [IPv6:::1]) by picard.linux.it (Postfix) with ESMTP id 319573C2432 for ; Fri, 24 Jan 2020 13:56:10 +0100 (CET) X-Original-To: ltp@lists.linux.it Delivered-To: ltp@picard.linux.it Received: from in-7.smtp.seeweb.it (in-7.smtp.seeweb.it [IPv6:2001:4b78:1:20::7]) by picard.linux.it (Postfix) with ESMTP id 6BEAE3C237A for ; Fri, 24 Jan 2020 13:55:39 +0100 (CET) Received: from mx2.suse.de (mx2.suse.de [195.135.220.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by in-7.smtp.seeweb.it (Postfix) with ESMTPS id BE3B7200981 for ; Fri, 24 Jan 2020 13:55:38 +0100 (CET) Received: from relay2.suse.de (unknown [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id 282CAB224 for ; Fri, 24 Jan 2020 12:55:38 +0000 (UTC) From: Martin Doucha To: ltp@lists.linux.it Date: Fri, 24 Jan 2020 13:55:35 +0100 Message-Id: <20200124125537.17714-2-mdoucha@suse.cz> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200124125537.17714-1-mdoucha@suse.cz> References: <20200124125537.17714-1-mdoucha@suse.cz> MIME-Version: 1.0 X-Virus-Scanned: clamav-milter 0.99.2 at in-7.smtp.seeweb.it X-Virus-Status: Clean X-Spam-Status: No, score=0.0 required=7.0 tests=SPF_HELO_NONE,SPF_PASS autolearn=disabled version=3.4.0 X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on in-7.smtp.seeweb.it Subject: [LTP] [PATCH v4 1/3] Add tst_purge_dir() helper function X-BeenThere: ltp@lists.linux.it X-Mailman-Version: 2.1.29 Precedence: list List-Id: Linux Test Project List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: ltp-bounces+incoming=patchwork.ozlabs.org@lists.linux.it Sender: "ltp" This function deletes the contents of the given directory while leaving the directory itself intact. Useful for purging the mountpoint between test iterations or test cases. Signed-off-by: Martin Doucha --- doc/test-writing-guidelines.txt | 11 ++++ include/tst_device.h | 5 ++ lib/tst_tmpdir.c | 97 +++++++++++++++++++-------------- 3 files changed, 72 insertions(+), 41 deletions(-) diff --git a/doc/test-writing-guidelines.txt b/doc/test-writing-guidelines.txt index f0aa69ad4..d87c8a451 100644 --- a/doc/test-writing-guidelines.txt +++ b/doc/test-writing-guidelines.txt @@ -1190,6 +1190,17 @@ Directory is considered empty if it contains only '.' and '..'. ------------------------------------------------------------------------------- #include "tst_test.h" +void tst_purge_dir(const char *path); +------------------------------------------------------------------------------- + +Deletes the contents of given directory but keeps the directory itself. Useful +for cleaning up the temporary directory and mount points between test cases or +test iterations. Terminates the program with 'TBROK' on error. + +[source,c] +------------------------------------------------------------------------------- +#include "tst_test.h" + int tst_fill_fd(int fd, char pattern, size_t bs, size_t bcount); ------------------------------------------------------------------------------- diff --git a/include/tst_device.h b/include/tst_device.h index 3ad33bd48..17bd55c32 100644 --- a/include/tst_device.h +++ b/include/tst_device.h @@ -84,4 +84,9 @@ int tst_dev_sync(int fd); */ unsigned long tst_dev_bytes_written(const char *dev); +/* + *Wipe the contents of given directory but keep the directory itself + */ +void tst_purge_dir(const char *path); + #endif /* TST_DEVICE_H__ */ diff --git a/lib/tst_tmpdir.c b/lib/tst_tmpdir.c index 09b7b6e22..0c39eb89f 100644 --- a/lib/tst_tmpdir.c +++ b/lib/tst_tmpdir.c @@ -99,6 +99,8 @@ static char test_start_work_dir[PATH_MAX]; /* lib/tst_checkpoint.c */ extern futex_t *tst_futexes; +static int rmobj(const char *obj, char **errmsg); + int tst_tmpdir_created(void) { return TESTDIR != NULL; @@ -119,60 +121,65 @@ const char *tst_get_startwd(void) return test_start_work_dir; } -static int rmobj(char *obj, char **errmsg) +static int purge_dir(const char *path, char **errptr) { int ret_val = 0; DIR *dir; struct dirent *dir_ent; char dirobj[PATH_MAX]; - struct stat statbuf; - static char err_msg[1024]; - int fd; + static char err_msg[PATH_MAX + 1280]; - fd = open(obj, O_DIRECTORY | O_NOFOLLOW); - if (fd != -1) { - close(fd); - - /* Do NOT perform the request if the directory is "/" */ - if (!strcmp(obj, "/")) { - if (errmsg != NULL) { - sprintf(err_msg, "Cannot remove /"); - *errmsg = err_msg; - } - return -1; + /* Do NOT perform the request if the directory is "/" */ + if (!strcmp(path, "/")) { + if (errptr) { + strcpy(err_msg, "Cannot purge system root directory"); + *errptr = err_msg; } - /* Open the directory to get access to what is in it */ - if ((dir = opendir(obj)) == NULL) { - if (rmdir(obj) != 0) { - if (errmsg != NULL) { - sprintf(err_msg, - "rmdir(%s) failed; errno=%d: %s", - obj, errno, tst_strerrno(errno)); - *errmsg = err_msg; - } - return -1; - } else { - return 0; - } + return -1; + } + + errno = 0; + + /* Open the directory to get access to what is in it */ + if (!(dir = opendir(path))) { + if (errptr) { + sprintf(err_msg, + "Cannot open directory %s; errno=%d: %s", + path, errno, tst_strerrno(errno)); + *errptr = err_msg; } + return -1; + } - /* Loop through the entries in the directory, removing each one */ - for (dir_ent = (struct dirent *)readdir(dir); - dir_ent != NULL; dir_ent = (struct dirent *)readdir(dir)) { + /* Loop through the entries in the directory, removing each one */ + for (dir_ent = readdir(dir); dir_ent; dir_ent = readdir(dir)) { + /* Don't remove "." or ".." */ + if (!strcmp(dir_ent->d_name, ".") + || !strcmp(dir_ent->d_name, "..")) + continue; + + /* Recursively remove the current entry */ + sprintf(dirobj, "%s/%s", path, dir_ent->d_name); + if (rmobj(dirobj, errptr) != 0) + ret_val = -1; + } - /* Don't remove "." or ".." */ - if (!strcmp(dir_ent->d_name, ".") - || !strcmp(dir_ent->d_name, "..")) - continue; + closedir(dir); + return ret_val; +} - /* Recursively call this routine to remove the current entry */ - sprintf(dirobj, "%s/%s", obj, dir_ent->d_name); - if (rmobj(dirobj, errmsg) != 0) - ret_val = -1; - } +static int rmobj(const char *obj, char **errmsg) +{ + int ret_val = 0; + struct stat statbuf; + static char err_msg[PATH_MAX + 1280]; + int fd; - closedir(dir); + fd = open(obj, O_DIRECTORY | O_NOFOLLOW); + if (fd >= 0) { + close(fd); + ret_val = purge_dir(obj, errmsg); /* If there were problems removing an entry, don't attempt to remove the directory itself */ @@ -330,3 +337,11 @@ void tst_rmdir(void) __func__, TESTDIR, errmsg); } } + +void tst_purge_dir(const char *path) +{ + char *err; + + if (purge_dir(path, &err)) + tst_brkm(TBROK, NULL, "%s: %s", __func__, err); +} From patchwork Fri Jan 24 12:55:36 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Martin Doucha X-Patchwork-Id: 1228818 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.linux.it (client-ip=2001:1418:10:5::2; helo=picard.linux.it; envelope-from=ltp-bounces+incoming=patchwork.ozlabs.org@lists.linux.it; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=suse.cz Received: from picard.linux.it (picard.linux.it [IPv6:2001:1418:10:5::2]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 483zfC5F3dz9sNF for ; Fri, 24 Jan 2020 23:56:03 +1100 (AEDT) Received: from picard.linux.it (localhost [IPv6:::1]) by picard.linux.it (Postfix) with ESMTP id 551B63C23AF for ; Fri, 24 Jan 2020 13:56:00 +0100 (CET) X-Original-To: ltp@lists.linux.it Delivered-To: ltp@picard.linux.it Received: from in-5.smtp.seeweb.it (in-5.smtp.seeweb.it [IPv6:2001:4b78:1:20::5]) by picard.linux.it (Postfix) with ESMTP id 98BFB3C237A for ; Fri, 24 Jan 2020 13:55:39 +0100 (CET) Received: from mx2.suse.de (mx2.suse.de [195.135.220.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by in-5.smtp.seeweb.it (Postfix) with ESMTPS id 89CA260BCFF for ; Fri, 24 Jan 2020 13:55:38 +0100 (CET) Received: from relay2.suse.de (unknown [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id 348BCB225 for ; Fri, 24 Jan 2020 12:55:38 +0000 (UTC) From: Martin Doucha To: ltp@lists.linux.it Date: Fri, 24 Jan 2020 13:55:36 +0100 Message-Id: <20200124125537.17714-3-mdoucha@suse.cz> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200124125537.17714-1-mdoucha@suse.cz> References: <20200124125537.17714-1-mdoucha@suse.cz> MIME-Version: 1.0 X-Virus-Scanned: clamav-milter 0.99.2 at in-5.smtp.seeweb.it X-Virus-Status: Clean X-Spam-Status: No, score=0.0 required=7.0 tests=SPF_HELO_NONE,SPF_PASS autolearn=disabled version=3.4.0 X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on in-5.smtp.seeweb.it Subject: [LTP] [PATCH v4 2/3] Add test for misaligned fallocate() X-BeenThere: ltp@lists.linux.it X-Mailman-Version: 2.1.29 Precedence: list List-Id: Linux Test Project List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: ltp-bounces+incoming=patchwork.ozlabs.org@lists.linux.it Sender: "ltp" Make sure that space allocation and deallocation works (or fails) correctly even when the requested file range does not align with filesystem blocks. Test on: - empty file system - full file system - also test with and without copy-on-write when supported Signed-off-by: Martin Doucha --- runtest/syscalls | 1 + .../kernel/syscalls/fallocate/fallocate06.c | 253 ++++++++++++++++++ 2 files changed, 254 insertions(+) create mode 100644 testcases/kernel/syscalls/fallocate/fallocate06.c diff --git a/runtest/syscalls b/runtest/syscalls index f58fefe17..e6e6b7bc6 100644 --- a/runtest/syscalls +++ b/runtest/syscalls @@ -186,6 +186,7 @@ fallocate02 fallocate02 fallocate03 fallocate03 fallocate04 fallocate04 fallocate05 fallocate05 +fallocate06 fallocate06 fsetxattr01 fsetxattr01 fsetxattr02 fsetxattr02 diff --git a/testcases/kernel/syscalls/fallocate/fallocate06.c b/testcases/kernel/syscalls/fallocate/fallocate06.c new file mode 100644 index 000000000..406249740 --- /dev/null +++ b/testcases/kernel/syscalls/fallocate/fallocate06.c @@ -0,0 +1,253 @@ +// SPDX-License-Identifier: GPL-2.0-or-later +/* + * Copyright (c) 2019 SUSE LLC + */ + +/* + * Tests misaligned fallocate() + * Test scenario: + * 1. write() several blocks worth of data + * 2. fallocate() some more space (not aligned to FS blocks) + * 3. try to write() into the allocated space + * 4. deallocate misaligned part of file range written in step 1 + * 5. read() the deallocated range and check that it was zeroed + * + * Subtests: + * - fill file system between step 2 and 3 + * - disable copy-on-write on test file + * - combinations of above subtests + */ + +#define _GNU_SOURCE + +#include +#include +#include +#include +#include +#include +#include "tst_test.h" +#include "lapi/fallocate.h" + +#define MNTPOINT "mntpoint" +#define TEMPFILE MNTPOINT "/test_file" +#define WRITE_BLOCKS 8 +#define FALLOCATE_BLOCKS 2 +#define DEALLOCATE_BLOCKS 3 +#define TESTED_FLAGS "fallocate(FALLOC_FL_PUNCH_HOLE | FALLOC_FL_KEEP_SIZE)" + +const struct test_case { + int no_cow, fill_fs; +} testcase_list[] = { + {1, 0}, + {1, 1}, + {0, 0}, + {0, 1} +}; + +static int cow_support; +static char *wbuf, *rbuf; +static blksize_t blocksize; +static long wbuf_size, rbuf_size, block_offset; + +static int toggle_cow(int fd, int enable) +{ + int ret, attr; + + ret = ioctl(fd, FS_IOC_GETFLAGS, &attr); + + if (ret) + return ret; + + if (enable) + attr &= ~FS_NOCOW_FL; + else + attr |= FS_NOCOW_FL; + + return ioctl(fd, FS_IOC_SETFLAGS, &attr); +} + +static void setup(void) { + unsigned char ch; + long i; + int fd; + struct stat statbuf; + + fd = SAFE_OPEN(TEMPFILE, O_WRONLY | O_CREAT | O_TRUNC); + + /* + * Set FS_NOCOW_FL flag on the temp file. Non-CoW filesystems will + * return error. + */ + TEST(toggle_cow(fd, 0)); + SAFE_FSTAT(fd, &statbuf); + blocksize = statbuf.st_blksize; + block_offset = MIN(blocksize / 2, 512); + wbuf_size = MAX(WRITE_BLOCKS, FALLOCATE_BLOCKS) * blocksize; + rbuf_size = (DEALLOCATE_BLOCKS + 1) * blocksize; + SAFE_CLOSE(fd); + SAFE_UNLINK(TEMPFILE); + + if (blocksize < 2) + tst_brk(TCONF, "Block size %ld too small for test", blocksize); + + if (!TST_RET) + cow_support = 1; + else switch (TST_ERR) { + case ENOTSUP: + case ENOTTY: + case EINVAL: + case ENOSYS: + cow_support = 0; + break; + + default: + tst_brk(TBROK|TTERRNO, "Error checking copy-on-write support"); + } + + tst_res(TINFO, "Copy-on-write is%s supported", + cow_support ? "" : " not"); + wbuf = SAFE_MALLOC(wbuf_size); + rbuf = SAFE_MALLOC(rbuf_size); + + /* Fill the buffer with known values */ + for (i = 0, ch = 1; i < wbuf_size; i++, ch++) { + wbuf[i] = ch; + } +} + +static int check_result(const struct test_case *tc, const char *func, long exp) +{ + if (tc->fill_fs && !tc->no_cow && TST_RET < 0) { + if (TST_RET != -1) { + tst_res(TFAIL, "%s returned unexpected value %ld", + func, TST_RET); + return 0; + } + + if (TST_ERR != ENOSPC) { + tst_res(TFAIL | TTERRNO, "%s should fail with ENOSPC", + func); + return 0; + } + + tst_res(TPASS | TTERRNO, "%s on full FS with CoW", func); + } else if (TST_RET < 0) { + tst_res(TFAIL | TTERRNO, "%s failed unexpectedly", func); + return 0; + } else if (TST_RET != exp) { + tst_res(TFAIL, + "Unexpected return value from %s: %ld (expected %ld)", + func, TST_RET, exp); + return 0; + } else + tst_res(TPASS, "%s successful", func); + + return 1; +} + +static void run(unsigned int n) +{ + int fd; + long offset, size; + const struct test_case *tc = testcase_list + n; + + tst_res(TINFO, "Case %u. Fill FS: %s; Use copy on write: %s", n+1, + tc->fill_fs ? "yes" : "no", tc->no_cow ? "no" : "yes"); + fd = SAFE_OPEN(TEMPFILE, O_RDWR | O_CREAT | O_TRUNC); + + if (cow_support) + toggle_cow(fd, !tc->no_cow); + else if (!tc->no_cow) + tst_brk(TCONF, "File system does not support copy-on-write"); + + /* Prepare test data for deallocation test */ + size = WRITE_BLOCKS * blocksize; + TEST(write(fd, wbuf, size)); + + if (TST_RET < 0) + tst_res(TFAIL | TTERRNO, "write() failed unexpectedly"); + else if (TST_RET != size) + tst_res(TFAIL, "Short write(): %ld bytes (expected %ld)", + TST_RET, size); + else + tst_res(TPASS, "write() wrote %ld bytes", TST_RET); + + /* Allocation test */ + offset = size + block_offset; + size = FALLOCATE_BLOCKS * blocksize; + TEST(fallocate(fd, 0, offset, size)); + + if (TST_RET) { + if (TST_ERR == ENOTSUP) { + SAFE_CLOSE(fd); + tst_brk(TCONF | TTERRNO, "fallocate() not supported"); + } + + tst_brk(TBROK | TTERRNO, "fallocate(fd, 0, %ld, %ld)", offset, + size); + } + + if (tc->fill_fs) + tst_fill_fs(MNTPOINT, 1); + + SAFE_LSEEK(fd, offset, SEEK_SET); + TEST(write(fd, wbuf, size)); + if (check_result(tc, "write()", size)) + tst_res(TPASS, "Misaligned allocation works as expected"); + + /* Deallocation test */ + size = DEALLOCATE_BLOCKS * blocksize; + offset = block_offset; + TEST(fallocate(fd, FALLOC_FL_PUNCH_HOLE | FALLOC_FL_KEEP_SIZE, offset, + size)); + + if (TST_RET == -1 && TST_ERR == ENOTSUP) { + tst_res(TCONF | TTERRNO, TESTED_FLAGS); + } else if (check_result(tc, TESTED_FLAGS, 0) && !TST_RET) { + int i, err = 0; + + SAFE_LSEEK(fd, 0, SEEK_SET); + SAFE_READ(1, fd, rbuf, rbuf_size); + + for (i = offset; i < offset + size; i++) { + if (rbuf[i]) { + err = 1; + break; + } + } + + err = err || memcmp(rbuf, wbuf, offset); + offset += size; + size = rbuf_size - offset; + err = err || memcmp(rbuf + offset, wbuf + offset, size); + + if (err) + tst_res(TFAIL, TESTED_FLAGS + " did not clear the correct file range."); + else + tst_res(TPASS, TESTED_FLAGS + " cleared the correct file range"); + } + + SAFE_CLOSE(fd); + tst_purge_dir(MNTPOINT); +} + +static void cleanup(void) +{ + free(wbuf); + free(rbuf); +} + +static struct tst_test test = { + .test = run, + .tcnt = ARRAY_SIZE(testcase_list), + .needs_root = 1, + .mount_device = 1, + .dev_min_size = 512, + .mntpoint = MNTPOINT, + .all_filesystems = 1, + .setup = setup, + .cleanup = cleanup, +}; From patchwork Fri Jan 24 12:55:37 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Martin Doucha X-Patchwork-Id: 1228817 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.linux.it (client-ip=213.254.12.146; helo=picard.linux.it; envelope-from=ltp-bounces+incoming=patchwork.ozlabs.org@lists.linux.it; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=suse.cz Received: from picard.linux.it (picard.linux.it [213.254.12.146]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 483zf12KZDz9sNF for ; Fri, 24 Jan 2020 23:55:53 +1100 (AEDT) Received: from picard.linux.it (localhost [IPv6:::1]) by picard.linux.it (Postfix) with ESMTP id 622713C242F for ; Fri, 24 Jan 2020 13:55:50 +0100 (CET) X-Original-To: ltp@lists.linux.it Delivered-To: ltp@picard.linux.it Received: from in-4.smtp.seeweb.it (in-4.smtp.seeweb.it [IPv6:2001:4b78:1:20::4]) by picard.linux.it (Postfix) with ESMTP id 31A253C237E for ; Fri, 24 Jan 2020 13:55:39 +0100 (CET) Received: from mx2.suse.de (mx2.suse.de [195.135.220.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by in-4.smtp.seeweb.it (Postfix) with ESMTPS id 63CB710019FD for ; Fri, 24 Jan 2020 13:55:38 +0100 (CET) Received: from relay2.suse.de (unknown [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id 3C191B227 for ; Fri, 24 Jan 2020 12:55:38 +0000 (UTC) From: Martin Doucha To: ltp@lists.linux.it Date: Fri, 24 Jan 2020 13:55:37 +0100 Message-Id: <20200124125537.17714-4-mdoucha@suse.cz> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200124125537.17714-1-mdoucha@suse.cz> References: <20200124125537.17714-1-mdoucha@suse.cz> MIME-Version: 1.0 X-Virus-Scanned: clamav-milter 0.99.2 at in-4.smtp.seeweb.it X-Virus-Status: Clean X-Spam-Status: No, score=0.0 required=7.0 tests=SPF_HELO_NONE,SPF_PASS autolearn=disabled version=3.4.0 X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on in-4.smtp.seeweb.it Subject: [LTP] [PATCH v4 3/3] Purge temp directory after each run of fallocate05 X-BeenThere: ltp@lists.linux.it X-Mailman-Version: 2.1.29 Precedence: list List-Id: Linux Test Project List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: ltp-bounces+incoming=patchwork.ozlabs.org@lists.linux.it Sender: "ltp" The fallocate05 test fills the test device so iterating the test requires purging the temp directory after each run. Signed-off-by: Martin Doucha --- testcases/kernel/syscalls/fallocate/fallocate05.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/testcases/kernel/syscalls/fallocate/fallocate05.c b/testcases/kernel/syscalls/fallocate/fallocate05.c index 00a1d3864..550d10258 100644 --- a/testcases/kernel/syscalls/fallocate/fallocate05.c +++ b/testcases/kernel/syscalls/fallocate/fallocate05.c @@ -30,13 +30,13 @@ #define DEALLOCATE_BLOCKS 4 #define TESTED_FLAGS "fallocate(FALLOC_FL_PUNCH_HOLE | FALLOC_FL_KEEP_SIZE)" -static int fd; static char *buf; static blksize_t blocksize; static long bufsize; static void setup(void) { + int fd; struct stat statbuf; fd = SAFE_OPEN(MNTPOINT "/test_file", O_WRONLY | O_CREAT); @@ -49,12 +49,15 @@ static void setup(void) blocksize = statbuf.st_blksize; bufsize = FALLOCATE_BLOCKS * blocksize; buf = SAFE_MALLOC(bufsize); + SAFE_CLOSE(fd); } static void run(void) { + int fd; long extsize, tmp; + fd = SAFE_OPEN(MNTPOINT "/test_file", O_WRONLY | O_CREAT | O_TRUNC); TEST(fallocate(fd, 0, 0, bufsize)); if (TST_RET) { @@ -131,14 +134,12 @@ static void run(void) else tst_res(TPASS, "write()"); - /* TODO: wipe the test device here to allow looping with -i/-I */ + SAFE_CLOSE(fd); + tst_purge_dir(MNTPOINT); } static void cleanup(void) { - if (fd > 0) - SAFE_CLOSE(fd); - free(buf); }