summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKen Sumrall <ksumrall@android.com>2011-03-22 20:42:37 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2011-03-22 20:42:37 -0700
commitef4b5b05af0506dfdb13028fb7167123ea1ec1eb (patch)
treee60af4f69ec9b13cdcc8e6325456be13564572c5
parentdcc60bf1a28c3b135c9ac2fa99a1297d54e39583 (diff)
parent8c00dae657ce7941121ec218d07adeab9ee3d8a1 (diff)
downloadextras-ef4b5b05af0506dfdb13028fb7167123ea1ec1eb.tar.gz
am 8c00dae6: am 427c3a21: Make a failure of the BLKDISCARD ioctl non-fatal.
* commit '8c00dae657ce7941121ec218d07adeab9ee3d8a1': Make a failure of the BLKDISCARD ioctl non-fatal.
-rw-r--r--ext4_utils/wipe.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/ext4_utils/wipe.c b/ext4_utils/wipe.c
index c7329cf3..3bd33e5b 100644
--- a/ext4_utils/wipe.c
+++ b/ext4_utils/wipe.c
@@ -43,7 +43,7 @@ int wipe_block_device(int fd, s64 len)
range[1] = len;
ret = ioctl(fd, BLKDISCARD, &range);
if (ret < 0) {
- error("Discard failed\n");
+ warn("Discard failed\n");
return 1;
} else {
warn("Wipe via secure discard failed, used discard instead\n");