From patchwork Fri Jul 9 07:52:02 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Li Wang X-Patchwork-Id: 1502958 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; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=Qs0wfijb; dkim-atps=neutral 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 4GLlkF4QGFz9sRR for ; Fri, 9 Jul 2021 17:52:21 +1000 (AEST) Received: from picard.linux.it (localhost [IPv6:::1]) by picard.linux.it (Postfix) with ESMTP id 76D4A3C790A for ; Fri, 9 Jul 2021 09:52:14 +0200 (CEST) X-Original-To: ltp@lists.linux.it Delivered-To: ltp@picard.linux.it Received: from in-2.smtp.seeweb.it (in-2.smtp.seeweb.it [217.194.8.2]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by picard.linux.it (Postfix) with ESMTPS id 0C7253C67DB for ; Fri, 9 Jul 2021 09:52:11 +0200 (CEST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by in-2.smtp.seeweb.it (Postfix) with ESMTPS id D8D16601489 for ; Fri, 9 Jul 2021 09:52:10 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1625817129; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YWMPr44kytVUkHT9pNke2/oXb3L6fDdQYYyp6xTfHrQ=; b=Qs0wfijbtwsDMuGfNVs/cJ+Ou8usOopRvVkLbYi5owHEf49hrAeePFRj9BSbz3+BxjqtR4 nrQ0ui7pPermdN5iAJ0QIlbOlhsfmEVedypNlXxsYzmzaSvaG89chg/GfeTcGf3jeKqM/q xXfzZfZVSK1otpD+QgAtxvn+kDJkS0k= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-463-0rpgiNnOPe-ye-kjxP1rBw-1; Fri, 09 Jul 2021 03:52:07 -0400 X-MC-Unique: 0rpgiNnOPe-ye-kjxP1rBw-1 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id C310D10C1ADC for ; Fri, 9 Jul 2021 07:52:06 +0000 (UTC) Received: from liwang-workstation.nay.redhat.com (dhcp-66-81-187.nay.redhat.com [10.66.81.187]) by smtp.corp.redhat.com (Postfix) with ESMTP id ED6245D6A8 for ; Fri, 9 Jul 2021 07:52:05 +0000 (UTC) From: Li Wang To: ltp@lists.linux.it Date: Fri, 9 Jul 2021 15:52:02 +0800 Message-Id: <20210709075204.999168-1-liwang@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=liwang@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Virus-Scanned: clamav-milter 0.102.4 at in-2.smtp.seeweb.it X-Virus-Status: Clean X-Spam-Status: No, score=0.1 required=7.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS autolearn=disabled version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on in-2.smtp.seeweb.it Subject: [LTP] [PATCH v3 1/3] lib: add new function tst_get_device_size 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" Signed-off-by: Li Wang Reviewed-by: Cyril Hrubis --- doc/c-test-api.txt | 10 ++++++ include/tst_device.h | 7 ++++ lib/tst_device.c | 76 +++++++++++++++++++++++++------------------- 3 files changed, 60 insertions(+), 33 deletions(-) diff --git a/doc/c-test-api.txt b/doc/c-test-api.txt index 4af1a9c97..e4ba858cf 100644 --- a/doc/c-test-api.txt +++ b/doc/c-test-api.txt @@ -979,6 +979,16 @@ This function finds the block dev that this path belongs to, it uses stat functi to get the major/minor number of the path. Then scan them in "/proc/self/mountinfo" and list 2th column value after ' - ' string as its block dev if match succeeds. +[source,c] +------------------------------------------------------------------------------- +#include "tst_test.h" + +uint64_t tst_get_device_size(const char *dev_path); +------------------------------------------------------------------------------- + +This function gets size of the given block device, it checks the dev_path is +valid first, if yes, return the size in MB, otherwise return -1. + 1.16 Formatting a device with a filesystem ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/include/tst_device.h b/include/tst_device.h index 1d1246e82..72c560c02 100644 --- a/include/tst_device.h +++ b/include/tst_device.h @@ -7,10 +7,12 @@ #define TST_DEVICE_H__ #include +#include struct tst_device { const char *dev; const char *fs_type; + uint64_t size; }; /* @@ -57,6 +59,11 @@ int tst_find_free_loopdev(const char *path, size_t path_len); */ int tst_attach_device(const char *dev_path, const char *file_path); +/* + * Get size (in MB) of the given device + */ +uint64_t tst_get_device_size(const char *dev_path); + /* * Detaches a file from a loop device fd. * diff --git a/lib/tst_device.c b/lib/tst_device.c index c096b418b..c91c6cd55 100644 --- a/lib/tst_device.c +++ b/lib/tst_device.c @@ -187,6 +187,48 @@ int tst_attach_device(const char *dev, const char *file) return 0; } +uint64_t tst_get_device_size(const char *dev_path) +{ + int fd; + uint64_t size; + struct stat st; + + if (!dev_path) + tst_brkm(TBROK, NULL, "No block device path"); + + if (stat(dev_path, &st)) { + tst_resm(TWARN | TERRNO, "stat() failed"); + return -1; + } + + if (!S_ISBLK(st.st_mode)) { + tst_resm(TWARN, "%s is not a block device", dev_path); + return -1; + } + + fd = open(dev_path, O_RDONLY); + if (fd < 0) { + tst_resm(TWARN | TERRNO, + "open(%s, O_RDONLY) failed", dev_path); + return -1; + } + + if (ioctl(fd, BLKGETSIZE64, &size)) { + tst_resm(TWARN | TERRNO, + "ioctl(fd, BLKGETSIZE64, ...) failed"); + close(fd); + return -1; + } + + if (close(fd)) { + tst_resm(TWARN | TERRNO, + "close(fd) failed"); + return -1; + } + + return size/1024/1024; +} + int tst_detach_device_by_fd(const char *dev, int dev_fd) { int ret, i; @@ -254,9 +296,7 @@ const char *tst_acquire_loop_device(unsigned int size, const char *filename) const char *tst_acquire_device__(unsigned int size) { - int fd; const char *dev; - struct stat st; unsigned int acq_dev_size; uint64_t ltp_dev_size; @@ -267,37 +307,7 @@ const char *tst_acquire_device__(unsigned int size) if (dev) { tst_resm(TINFO, "Using test device LTP_DEV='%s'", dev); - if (stat(dev, &st)) { - tst_resm(TWARN | TERRNO, "stat() failed"); - return NULL; - } - - if (!S_ISBLK(st.st_mode)) { - tst_resm(TWARN, "%s is not a block device", dev); - return NULL; - } - - fd = open(dev, O_RDONLY); - if (fd < 0) { - tst_resm(TWARN | TERRNO, - "open(%s, O_RDONLY) failed", dev); - return NULL; - } - - if (ioctl(fd, BLKGETSIZE64, <p_dev_size)) { - tst_resm(TWARN | TERRNO, - "ioctl(fd, BLKGETSIZE64, ...) failed"); - close(fd); - return NULL; - } - - if (close(fd)) { - tst_resm(TWARN | TERRNO, - "close(fd) failed"); - return NULL; - } - - ltp_dev_size = ltp_dev_size/1024/1024; + ltp_dev_size = tst_get_device_size(dev); if (acq_dev_size <= ltp_dev_size) return dev; From patchwork Fri Jul 9 07:52:03 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Li Wang X-Patchwork-Id: 1502959 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; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=TDFOYWbI; dkim-atps=neutral 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)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4GLlkL4dZqz9sRR for ; Fri, 9 Jul 2021 17:52:26 +1000 (AEST) Received: from picard.linux.it (localhost [IPv6:::1]) by picard.linux.it (Postfix) with ESMTP id BF0873C6E46 for ; Fri, 9 Jul 2021 09:52:23 +0200 (CEST) X-Original-To: ltp@lists.linux.it Delivered-To: ltp@picard.linux.it Received: from in-2.smtp.seeweb.it (in-2.smtp.seeweb.it [IPv6:2001:4b78:1:20::2]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by picard.linux.it (Postfix) with ESMTPS id 15FE43C67DB for ; Fri, 9 Jul 2021 09:52:13 +0200 (CEST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by in-2.smtp.seeweb.it (Postfix) with ESMTPS id 8BD976001F2 for ; Fri, 9 Jul 2021 09:52:12 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1625817131; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=bY9+nzDLwKCSCZmClwW3jjFrkMobaI8MQBlGE/ebodE=; b=TDFOYWbImvdGJ9nFbRRkj+cB4cHofJMfHoWfbHkah4aMoFuh3qShs7moCzrwm0OB/UvPYU jlpLHtUKEuEnOX8+j+GJ3TOsqFl+lKlyamo1PDkJGMAeHAByDRIr3r12dBMXNlsH1ETCoH u7kS/rqLZ7bOAXOQQGT8dnJ4cQDJG3E= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-162-hpbu3bguNkGraeHM7-Oa6w-1; Fri, 09 Jul 2021 03:52:09 -0400 X-MC-Unique: hpbu3bguNkGraeHM7-Oa6w-1 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 60560362F9; Fri, 9 Jul 2021 07:52:08 +0000 (UTC) Received: from liwang-workstation.nay.redhat.com (dhcp-66-81-187.nay.redhat.com [10.66.81.187]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4C2C25D6A8; Fri, 9 Jul 2021 07:52:07 +0000 (UTC) From: Li Wang To: ltp@lists.linux.it Date: Fri, 9 Jul 2021 15:52:03 +0800 Message-Id: <20210709075204.999168-2-liwang@redhat.com> In-Reply-To: <20210709075204.999168-1-liwang@redhat.com> References: <20210709075204.999168-1-liwang@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=liwang@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Virus-Scanned: clamav-milter 0.102.4 at in-2.smtp.seeweb.it X-Virus-Status: Clean X-Spam-Status: No, score=0.1 required=7.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS autolearn=disabled version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on in-2.smtp.seeweb.it Subject: [LTP] [PATCH v3 2/3] lib: limit the size of tmpfs in LTP 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" LTP mount and make use of the whole tmpfs of the test system, generally, it's fine. But if a test (e.g fallocate06) try to fill full in the filesystem, it takes too long to complete testing on a large memory system. This patch adds a new function limit_tmpfs_mount_size with appending '-o size=xxM' to the mount options in prepare_device() which helps limit the tmpfs mount size. Suggested-by: Cyril Hrubis Signed-off-by: Li Wang --- lib/tst_test.c | 25 ++++++++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) diff --git a/lib/tst_test.c b/lib/tst_test.c index 55449c80b..b996f1b2e 100644 --- a/lib/tst_test.c +++ b/lib/tst_test.c @@ -882,8 +882,26 @@ static void prepare_and_mount_dev_fs(const char *mntpoint) } } +static char *limit_tmpfs_mount_size(const char *mnt_data, + char *buf, size_t buf_size, const char *fs_type) +{ + if (strcmp(fs_type, "tmpfs")) + return mnt_data; + + if (mnt_data) + snprintf(buf, buf_size, "%s,size=%luM", mnt_data, tdev.size); + else + snprintf(buf, buf_size, "size=%luM", tdev.size); + + tst_res(TINFO, "Limiting tmpfs size to %luMB", tdev.size); + + return buf; +} + static void prepare_device(void) { + char *mnt_data, buf[1024]; + if (tst_test->format_device) { SAFE_MKFS(tdev.dev, tdev.fs_type, tst_test->dev_fs_opts, tst_test->dev_extra_opts); @@ -896,8 +914,11 @@ static void prepare_device(void) } if (tst_test->mount_device) { + mnt_data = limit_tmpfs_mount_size(tst_test->mnt_data, + buf, sizeof(buf), tdev.fs_type); + SAFE_MOUNT(tdev.dev, tst_test->mntpoint, tdev.fs_type, - tst_test->mnt_flags, tst_test->mnt_data); + tst_test->mnt_flags, mnt_data); mntpoint_mounted = 1; } } @@ -1015,6 +1036,8 @@ static void do_setup(int argc, char *argv[]) if (!tdev.dev) tst_brk(TCONF, "Failed to acquire device"); + tdev.size = tst_get_device_size(tdev.dev); + tst_device = &tdev; if (tst_test->dev_fs_type) From patchwork Fri Jul 9 07:52:04 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Li Wang X-Patchwork-Id: 1502960 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; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=aNlTwEf4; dkim-atps=neutral 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 4GLlkV67T7z9sRR for ; Fri, 9 Jul 2021 17:52:34 +1000 (AEST) Received: from picard.linux.it (localhost [IPv6:::1]) by picard.linux.it (Postfix) with ESMTP id C2B573C67DC for ; Fri, 9 Jul 2021 09:52:32 +0200 (CEST) X-Original-To: ltp@lists.linux.it Delivered-To: ltp@picard.linux.it Received: from in-2.smtp.seeweb.it (in-2.smtp.seeweb.it [217.194.8.2]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by picard.linux.it (Postfix) with ESMTPS id 4119B3C790A for ; Fri, 9 Jul 2021 09:52:14 +0200 (CEST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by in-2.smtp.seeweb.it (Postfix) with ESMTPS id B71366001F2 for ; Fri, 9 Jul 2021 09:52:13 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1625817132; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=tJgH3fbalZQlUHldMEHnzw72GqiKRIluSoozc+P1mU8=; b=aNlTwEf4RYbmdwQ+s3PbLnU87jWXwcLQv9Dm4qVMYIFFvlWgVpPbv3vBHREFak/fYtgprV FsBqM3mHk/XN/NVZKTCEaOlLKO0EoDWlDXsDGoY3tseQtCTQzO2CU2ZVWQNRYzwhQD48U0 xZgbjxOyTsJU4mCDkgqP69sFRwXzzOw= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-107-yPem5-JpOcW7lA5B-qeOzQ-1; Fri, 09 Jul 2021 03:52:11 -0400 X-MC-Unique: yPem5-JpOcW7lA5B-qeOzQ-1 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id F232D100CA89; Fri, 9 Jul 2021 07:52:09 +0000 (UTC) Received: from liwang-workstation.nay.redhat.com (dhcp-66-81-187.nay.redhat.com [10.66.81.187]) by smtp.corp.redhat.com (Postfix) with ESMTP id DE3F05D6A8; Fri, 9 Jul 2021 07:52:08 +0000 (UTC) From: Li Wang To: ltp@lists.linux.it Date: Fri, 9 Jul 2021 15:52:04 +0800 Message-Id: <20210709075204.999168-3-liwang@redhat.com> In-Reply-To: <20210709075204.999168-1-liwang@redhat.com> References: <20210709075204.999168-1-liwang@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=liwang@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Virus-Scanned: clamav-milter 0.102.4 at in-2.smtp.seeweb.it X-Virus-Status: Clean X-Spam-Status: No, score=0.1 required=7.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS autolearn=disabled version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on in-2.smtp.seeweb.it Subject: [LTP] [PATCH v3 3/3] lib: mount tmpfs name as ltp-tmpfs 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" Given a specific name as "ltp-tmpfs" instead of the "/dev/loopX" string in order to make "tmpfs" filesystem more evident. Achieve that in get_device_name() function. Suggested-by: Cyril Hrubis Signed-off-by: Li Wang Reviewed-by: Cyril Hrubis --- lib/tst_test.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/lib/tst_test.c b/lib/tst_test.c index b996f1b2e..f4d9f8e3b 100644 --- a/lib/tst_test.c +++ b/lib/tst_test.c @@ -898,6 +898,14 @@ static char *limit_tmpfs_mount_size(const char *mnt_data, return buf; } +static const char *get_device_name(const char *fs_type) +{ + if (!strcmp(fs_type, "tmpfs")) + return "ltp-tmpfs"; + else + return tdev.dev; +} + static void prepare_device(void) { char *mnt_data, buf[1024]; @@ -917,8 +925,8 @@ static void prepare_device(void) mnt_data = limit_tmpfs_mount_size(tst_test->mnt_data, buf, sizeof(buf), tdev.fs_type); - SAFE_MOUNT(tdev.dev, tst_test->mntpoint, tdev.fs_type, - tst_test->mnt_flags, mnt_data); + SAFE_MOUNT(get_device_name(tdev.fs_type), tst_test->mntpoint, + tdev.fs_type, tst_test->mnt_flags, mnt_data); mntpoint_mounted = 1; } }