* Tue Nov 10 2009 Eric Sandeen <sandeen@redhat.com> 1.41.9-7
- re-enable "make check" during build
This commit is contained in:
Eric Sandeen
parent
c89ade3110
commit
521712b595
File diff suppressed because it is too large
Load Diff
|
|
@ -0,0 +1,138 @@
|
|||
Try calling the BLKDISCARD ioctl at mkfs time to pre-discard all blocks
|
||||
on an ssd, or a thinly-provisioned storage device.
|
||||
|
||||
No real error checking; if it fails, it fails, and that's ok - it's
|
||||
just an optimization. Also, it cannot work in conjunction with
|
||||
the undo io manager, for obvious reasons.
|
||||
|
||||
Optionally disabled with a "-K" (mnemonic: Keep) option.
|
||||
|
||||
Signed-off-by: Eric Sandeen <sandeen@redhat.com>
|
||||
---
|
||||
|
||||
Index: e2fsprogs-1.41.9/misc/mke2fs.8.in
|
||||
===================================================================
|
||||
--- e2fsprogs-1.41.9.orig/misc/mke2fs.8.in
|
||||
+++ e2fsprogs-1.41.9/misc/mke2fs.8.in
|
||||
@@ -45,6 +45,9 @@ mke2fs \- create an ext2/ext3/ext4 files
|
||||
.I journal-options
|
||||
]
|
||||
[
|
||||
+.B \-K
|
||||
+]
|
||||
+[
|
||||
.B \-N
|
||||
.I number-of-inodes
|
||||
]
|
||||
@@ -364,6 +367,10 @@ and may be no more than 102,400 filesyst
|
||||
@JDEV@.BR size " or " device
|
||||
@JDEV@options can be given for a filesystem.
|
||||
.TP
|
||||
+.BI \-K
|
||||
+Keep, do not attempt to discard blocks at mkfs time (discarding blocks initially
|
||||
+is useful on solid state devices and sparse / thin-provisioned storage).
|
||||
+.TP
|
||||
.BI \-l " filename"
|
||||
Read the bad blocks list from
|
||||
.IR filename .
|
||||
Index: e2fsprogs-1.41.9/misc/mke2fs.c
|
||||
===================================================================
|
||||
--- e2fsprogs-1.41.9.orig/misc/mke2fs.c
|
||||
+++ e2fsprogs-1.41.9/misc/mke2fs.c
|
||||
@@ -79,6 +79,7 @@ int cflag;
|
||||
int verbose;
|
||||
int quiet;
|
||||
int super_only;
|
||||
+int discard = 1;
|
||||
int force;
|
||||
int noaction;
|
||||
int journal_size;
|
||||
@@ -111,7 +112,7 @@ static void usage(void)
|
||||
"\t[-g blocks-per-group] [-L volume-label] "
|
||||
"[-M last-mounted-directory]\n\t[-O feature[,...]] "
|
||||
"[-r fs-revision] [-E extended-option[,...]]\n"
|
||||
- "\t[-T fs-type] [-U UUID] [-jnqvFSV] device [blocks-count]\n"),
|
||||
+ "\t[-T fs-type] [-U UUID] [-jnqvFKSV] device [blocks-count]\n"),
|
||||
program_name);
|
||||
exit(1);
|
||||
}
|
||||
@@ -1206,7 +1207,7 @@ static void PRS(int argc, char *argv[])
|
||||
}
|
||||
|
||||
while ((c = getopt (argc, argv,
|
||||
- "b:cf:g:G:i:jl:m:no:qr:s:t:vE:FI:J:L:M:N:O:R:ST:U:V")) != EOF) {
|
||||
+ "b:cf:g:G:i:jl:m:no:qr:s:t:vE:FI:J:KL:M:N:O:R:ST:U:V")) != EOF) {
|
||||
switch (c) {
|
||||
case 'b':
|
||||
blocksize = strtol(optarg, &tmp, 0);
|
||||
@@ -1285,6 +1286,9 @@ static void PRS(int argc, char *argv[])
|
||||
case 'J':
|
||||
parse_journal_opts(optarg);
|
||||
break;
|
||||
+ case 'K':
|
||||
+ discard = 0;
|
||||
+ break;
|
||||
case 'j':
|
||||
if (!journal_size)
|
||||
journal_size = -1;
|
||||
@@ -1906,6 +1910,48 @@ static int mke2fs_setup_tdb(const char *
|
||||
return retval;
|
||||
}
|
||||
|
||||
+#ifdef __linux__
|
||||
+
|
||||
+#ifndef BLKDISCARD
|
||||
+#define BLKDISCARD _IO(0x12,119)
|
||||
+#endif
|
||||
+
|
||||
+static void mke2fs_discard_blocks(ext2_filsys fs)
|
||||
+{
|
||||
+ int fd;
|
||||
+ int ret;
|
||||
+ int blocksize;
|
||||
+ __u64 blocks;
|
||||
+ __uint64_t range[2];
|
||||
+
|
||||
+ blocks = fs->super->s_blocks_count;
|
||||
+ blocksize = EXT2_BLOCK_SIZE(fs->super);
|
||||
+ range[0] = 0;
|
||||
+ range[1] = blocks * blocksize;
|
||||
+
|
||||
+ fd = open64(fs->device_name, O_RDONLY);
|
||||
+
|
||||
+ /*
|
||||
+ * We don't care about whether the ioctl succeeds; it's only an
|
||||
+ * optmization for SSDs or sparse storage.
|
||||
+ */
|
||||
+ if (fd > 0) {
|
||||
+ ret = ioctl(fd, BLKDISCARD, &range);
|
||||
+ if (verbose) {
|
||||
+ printf(_("Calling BLKDISCARD from %llu to %llu "),
|
||||
+ range[0], range[1]);
|
||||
+ if (ret)
|
||||
+ printf(_("failed.\n"));
|
||||
+ else
|
||||
+ printf(_("succeeded.\n"));
|
||||
+ }
|
||||
+ close(fd);
|
||||
+ }
|
||||
+}
|
||||
+#else
|
||||
+#define mke2fs_discard_blocks(fs)
|
||||
+#endif
|
||||
+
|
||||
int main (int argc, char *argv[])
|
||||
{
|
||||
errcode_t retval = 0;
|
||||
@@ -1949,6 +1995,11 @@ int main (int argc, char *argv[])
|
||||
com_err(device_name, retval, _("while setting up superblock"));
|
||||
exit(1);
|
||||
}
|
||||
+
|
||||
+ /* Can't undo discard ... */
|
||||
+ if (discard && (io_ptr != undo_io_manager))
|
||||
+ mke2fs_discard_blocks(fs);
|
||||
+
|
||||
sprintf(tdb_string, "tdb_data_size=%d", fs->blocksize <= 4096 ?
|
||||
32768 : fs->blocksize * 8);
|
||||
io_channel_set_options(fs->io, tdb_string);
|
||||
|
|
@ -4,7 +4,7 @@
|
|||
Summary: Utilities for managing ext2, ext3, and ext4 filesystems
|
||||
Name: e2fsprogs
|
||||
Version: 1.41.9
|
||||
Release: 5%{?dist}
|
||||
Release: 7%{?dist}
|
||||
|
||||
# License tags based on COPYING file distinctions for various components
|
||||
License: GPLv2
|
||||
|
|
@ -15,6 +15,8 @@ Source1: ext2_types-wrapper.h
|
|||
Patch2: e2fsprogs-1.40.4-sb_feature_check_ignore.patch
|
||||
Patch4: e2fsprogs-resize-minimum-fix.patch
|
||||
Patch5: e2fsprogs-1.41.9-24hr-fsck-grace.patch
|
||||
Patch6: e2fsprogs-1.41.9-topology.patch
|
||||
Patch7: e2fsprogs-1.41.9-trim.patch
|
||||
|
||||
Url: http://e2fsprogs.sourceforge.net/
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
||||
|
|
@ -142,6 +144,8 @@ It was originally inspired by the Multics SubSystem library.
|
|||
%patch2 -p1 -b .featurecheck
|
||||
%patch4 -p1 -b .resize
|
||||
%patch5 -p1 -b .24h
|
||||
%patch6 -p1 -b .topo
|
||||
%patch7 -p1 -b .trim
|
||||
|
||||
%build
|
||||
%configure --enable-elf-shlibs --enable-nls --disable-uuidd --disable-fsck \
|
||||
|
|
@ -302,6 +306,13 @@ exit 0
|
|||
%{_libdir}/pkgconfig/ss.pc
|
||||
|
||||
%changelog
|
||||
* Tue Nov 10 2009 Eric Sandeen <sandeen@redhat.com> 1.41.9-7
|
||||
- re-enable "make check" during build
|
||||
|
||||
* Wed Oct 28 2009 Eric Sandeen <sandeen@redhat.com> 1.41.9-6
|
||||
- Add support for block discard (TRIM) at mkfs time
|
||||
- Add support for new blkid topology awareness
|
||||
|
||||
* Mon Oct 19 2009 Eric Sandeen <sandeen@redhat.com> 1.41.9-5
|
||||
- Allow superblock timestamp differences up to 24h (#522969)
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue