From: "Theodore Ts'o" <tytso@mit.edu>
To: fstests@vger.kernel.org
Cc: hughd@google.com, Junho Ryu <jayr@google.com>,
Theodore Ts'o <tytso@mit.edu>
Subject: [PATCH 02/13] common: _scratch_mkfs_sized() for tmpfs
Date: Thu, 11 Feb 2016 00:56:11 -0500 [thread overview]
Message-ID: <1455170182-32587-3-git-send-email-tytso@mit.edu> (raw)
In-Reply-To: <1455170182-32587-1-git-send-email-tytso@mit.edu>
From: Hugh Dickins <hughd@google.com>
Enable _scratch_mkfs_sized() for use with tmpfs, so that tests which
use this helper can now run.
Signed-off-by: Hugh Dickins <hughd@google.com>
Signed-off-by: Junho Ryu <jayr@google.com>
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
---
common/rc | 15 ++++++++++++++-
1 file changed, 14 insertions(+), 1 deletion(-)
diff --git a/common/rc b/common/rc
index 76e02e4..10aaf35 100644
--- a/common/rc
+++ b/common/rc
@@ -783,6 +783,12 @@ _scratch_pool_mkfs()
esac
}
+# Return the amount of free memory available on the system
+_free_memory_bytes()
+{
+ free -b | grep ^Mem | awk '{print $4}'
+}
+
# Create fs of certain size on scratch device
# _scratch_mkfs_sized <size in bytes> [optional blocksize]
_scratch_mkfs_sized()
@@ -813,7 +819,7 @@ _scratch_mkfs_sized()
blocks=`expr $fssize / $blocksize`
- if [ "$HOSTOS" == "Linux" ]; then
+ if [ "$HOSTOS" == "Linux" -a -b "$SCRATCH_DEV" ]; then
devsize=`blockdev --getsize64 $SCRATCH_DEV`
[ "$fssize" -gt "$devsize" ] && _notrun "Scratch device too small"
fi
@@ -849,6 +855,13 @@ _scratch_mkfs_sized()
sector_size=`blockdev --getss $SCRATCH_DEV`
$MKFS_F2FS_PROG $MKFS_OPTIONS $SCRATCH_DEV `expr $fssize / $sector_size`
;;
+ tmpfs)
+ free_mem=`_free_memory_bytes`
+ if [ "$free_mem" -lt "$fssize" ] ; then
+ _notrun "Not enough memory ($free_mem) for tmpfs with $fssize bytes"
+ fi
+ export MOUNT_OPTIONS="-o size=$fssize $TMPFS_MOUNT_OPTIONS"
+ ;;
*)
_notrun "Filesystem $FSTYP not supported in _scratch_mkfs_sized"
;;
--
2.5.0
next prev parent reply other threads:[~2016-02-11 5:56 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-02-11 5:56 [PATCH-v2 00/13] fix up various tmpfs failures Theodore Ts'o
2016-02-11 5:56 ` [PATCH 01/13] check: avoid spurious complaints that tests/$FSTYP/group does not exist Theodore Ts'o
2016-02-11 5:56 ` Theodore Ts'o [this message]
2016-02-11 5:56 ` [PATCH 03/13] generic: use mount point instead of device name Theodore Ts'o
2016-02-11 5:56 ` [PATCH 04/13] generic: remove the generic/125 test Theodore Ts'o
2016-02-12 5:29 ` Eryu Guan
2016-02-11 5:56 ` [PATCH 05/13] generic: add _require_odirect to generic/113 and generic/214 Theodore Ts'o
2016-02-11 5:56 ` [PATCH 06/13] xfstests: do not unmount tmpfs during remount Theodore Ts'o
2016-02-11 5:56 ` [PATCH 07/13] generic: do not unmount before calling _check_scratch_fs() Theodore Ts'o
2016-02-11 5:56 ` [PATCH 08/13] generic: require fiemap for generic/009 Theodore Ts'o
2016-02-11 5:56 ` [PATCH 09/13] xfstests: remove dependency on /proc/partitions for generic/312 Theodore Ts'o
2016-02-11 5:56 ` [PATCH 10/13] xfstests: generic/079 and generic/277 requires chattr, not xattrs Theodore Ts'o
2016-02-11 5:56 ` [PATCH 11/13] xfstests: add executable permission to tests Theodore Ts'o
2016-02-11 5:56 ` [PATCH 12/13] xfstests: increase tmpfs memory size Theodore Ts'o
2016-02-11 5:56 ` [PATCH 13/13] common: remove unneeded mount options for ext4 Theodore Ts'o
2016-02-12 3:57 ` Dave Chinner
2016-02-12 5:41 ` Theodore Ts'o
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1455170182-32587-3-git-send-email-tytso@mit.edu \
--to=tytso@mit.edu \
--cc=fstests@vger.kernel.org \
--cc=hughd@google.com \
--cc=jayr@google.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox