chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
b8f8323
)
cryptsetup: support discards (TRIM)
author
Matthew Monaco
<matthew.monaco@0x01b.net>
Sat, 19 May 2012 15:05:50 +0000
(09:05 -0600)
committer
Lennart Poettering
<lennart@poettering.net>
Mon, 21 May 2012 15:28:06 +0000
(17:28 +0200)
src/cryptsetup/cryptsetup.c
patch
|
blob
|
history
diff --git
a/src/cryptsetup/cryptsetup.c
b/src/cryptsetup/cryptsetup.c
index 6d4e965fe11be56eface30edb832816962058e69..b26fcca836993c73019f56f351793bf8f8ad3354 100644
(file)
--- a/
src/cryptsetup/cryptsetup.c
+++ b/
src/cryptsetup/cryptsetup.c
@@
-41,6
+41,7
@@
static char *opt_hash = NULL;
static unsigned opt_tries = 0;
static bool opt_readonly = false;
static bool opt_verify = false;
static unsigned opt_tries = 0;
static bool opt_readonly = false;
static bool opt_verify = false;
+static bool opt_discards = false;
static usec_t opt_timeout = DEFAULT_TIMEOUT_USEC;
/* Options Debian's crypttab knows we don't:
static usec_t opt_timeout = DEFAULT_TIMEOUT_USEC;
/* Options Debian's crypttab knows we don't:
@@
-98,6
+99,8
@@
static int parse_one_option(const char *option) {
opt_readonly = true;
else if (streq(option, "verify"))
opt_verify = true;
opt_readonly = true;
else if (streq(option, "verify"))
opt_verify = true;
+ else if (streq(option, "allow-discards"))
+ opt_discards = true;
else if (streq(option, "luks"))
opt_type = CRYPT_LUKS1;
else if (streq(option, "plain") ||
else if (streq(option, "luks"))
opt_type = CRYPT_LUKS1;
else if (streq(option, "plain") ||
@@
-314,6
+317,9
@@
int main(int argc, char *argv[]) {
if (opt_readonly)
flags |= CRYPT_ACTIVATE_READONLY;
if (opt_readonly)
flags |= CRYPT_ACTIVATE_READONLY;
+ if (opt_discards)
+ flags |= CRYPT_ACTIVATE_ALLOW_DISCARDS;
+
if (opt_timeout > 0)
until = now(CLOCK_MONOTONIC) + opt_timeout;
else
if (opt_timeout > 0)
until = now(CLOCK_MONOTONIC) + opt_timeout;
else