summaryrefslogtreecommitdiffstats
path: root/cryptfs.c
diff options
context:
space:
mode:
authorElliott Hughes <enh@google.com>2015-02-05 20:35:09 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-02-05 20:35:09 +0000
commitefb4c6d79aa8809dc510826fd25e8109676021cb (patch)
tree58ffc2ca2b47e3867b8c217e21eb676bea2da836 /cryptfs.c
parent394cd68fcdd11271a9b71f6c83acaf5b347cb7b1 (diff)
parent71f8d86fdfc2c11f2d4176eabb98812bf41792e7 (diff)
downloadandroid_system_vold-efb4c6d79aa8809dc510826fd25e8109676021cb.tar.gz
android_system_vold-efb4c6d79aa8809dc510826fd25e8109676021cb.tar.bz2
android_system_vold-efb4c6d79aa8809dc510826fd25e8109676021cb.zip
am 71f8d86f: am f805a8b3: Merge "Change lseek to lseek64"
* commit '71f8d86fdfc2c11f2d4176eabb98812bf41792e7': Change lseek to lseek64
Diffstat (limited to 'cryptfs.c')
-rw-r--r--cryptfs.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/cryptfs.c b/cryptfs.c
index 975241e..a8b159e 100644
--- a/cryptfs.c
+++ b/cryptfs.c
@@ -862,13 +862,13 @@ static int save_persistent_data(void)
}
/* Write the new copy first, if successful, then erase the old copy */
- if (lseek(fd, write_offset, SEEK_SET) < 0) {
+ if (lseek64(fd, write_offset, SEEK_SET) < 0) {
SLOGE("Cannot seek to write persistent data");
goto err2;
}
if (unix_write(fd, persist_data, crypt_ftr.persist_data_size) ==
(int) crypt_ftr.persist_data_size) {
- if (lseek(fd, erase_offset, SEEK_SET) < 0) {
+ if (lseek64(fd, erase_offset, SEEK_SET) < 0) {
SLOGE("Cannot seek to erase previous persistent data");
goto err2;
}