diff options
| author | The Android Automerger <android-build@android.com> | 2011-03-23 12:19:41 -0700 |
|---|---|---|
| committer | The Android Automerger <android-build@android.com> | 2011-03-23 12:19:41 -0700 |
| commit | fe1eb68519f08da12434500156e72a6ff54b2c66 (patch) | |
| tree | 114b337abe6e079db0e74f161fc99c6768fb5374 | |
| parent | 7f44798d3b28572e14eda7896784f8b223ad80e9 (diff) | |
| parent | 427c3a2177eb4d34c88406bb86107548737168cc (diff) | |
| download | extras-fe1eb68519f08da12434500156e72a6ff54b2c66.tar.gz | |
Merge commit '427c3a2177eb4d34c88406bb86107548737168cc' into honeycomb-release
| -rw-r--r-- | ext4_utils/wipe.c | 6 | ||||
| -rw-r--r-- | ext4_utils/wipe.h | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/ext4_utils/wipe.c b/ext4_utils/wipe.c index 990b82fc..3bd33e5b 100644 --- a/ext4_utils/wipe.c +++ b/ext4_utils/wipe.c @@ -30,7 +30,7 @@ #define BLKSECDISCARD _IO(0x12,125) #endif -int wipe_block_device(int fd, int len) +int wipe_block_device(int fd, s64 len) { u64 range[2]; int ret; @@ -43,7 +43,7 @@ int wipe_block_device(int fd, int 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"); @@ -54,7 +54,7 @@ int wipe_block_device(int fd, int len) return 0; } #else -int wipe_block_device(int fd, int len) +int wipe_block_device(int fd, s64 len) { error("wipe not supported on non-linux platforms"); return 1; diff --git a/ext4_utils/wipe.h b/ext4_utils/wipe.h index 0b54b465..814877d8 100644 --- a/ext4_utils/wipe.h +++ b/ext4_utils/wipe.h @@ -17,6 +17,6 @@ #ifndef _WIPE_H_ #define _WIPE_H_ -int wipe_block_device(int fd, int len); +int wipe_block_device(int fd, s64 len); #endif |