summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJaegeuk Kim <jaegeuk@google.com>2018-08-01 09:27:20 +0200
committerandroid-build-merger <android-build-merger@google.com>2018-08-01 09:27:20 +0200
commit4adfcf962fcf0c2cf68c0c3b268a485aee8284f1 (patch)
tree3dc6b6c727dc61a8762979d6237315987edd28ac
parentMerge "recovery: Add ability to interrupt UI" am: 561ee9362c (diff)
parentMerge "uncrypt: fix f2fs ioctl argument for pin_file" (diff)
downloadandroid_bootable_recovery-4adfcf962fcf0c2cf68c0c3b268a485aee8284f1.tar
android_bootable_recovery-4adfcf962fcf0c2cf68c0c3b268a485aee8284f1.tar.gz
android_bootable_recovery-4adfcf962fcf0c2cf68c0c3b268a485aee8284f1.tar.bz2
android_bootable_recovery-4adfcf962fcf0c2cf68c0c3b268a485aee8284f1.tar.lz
android_bootable_recovery-4adfcf962fcf0c2cf68c0c3b268a485aee8284f1.tar.xz
android_bootable_recovery-4adfcf962fcf0c2cf68c0c3b268a485aee8284f1.tar.zst
android_bootable_recovery-4adfcf962fcf0c2cf68c0c3b268a485aee8284f1.zip
-rw-r--r--uncrypt/uncrypt.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/uncrypt/uncrypt.cpp b/uncrypt/uncrypt.cpp
index 16036f9ce..95f40c71f 100644
--- a/uncrypt/uncrypt.cpp
+++ b/uncrypt/uncrypt.cpp
@@ -332,7 +332,8 @@ static int produce_block_map(const char* path, const char* map_file, const char*
#define F2FS_IOC_GET_PIN_FILE _IOW(F2FS_IOCTL_MAGIC, 14, __u32)
#endif
if (f2fs_fs) {
- int error = ioctl(fd, F2FS_IOC_SET_PIN_FILE);
+ __u32 set = 1;
+ int error = ioctl(fd, F2FS_IOC_SET_PIN_FILE, &set);
// Don't break the old kernels which don't support it.
if (error && errno != ENOTTY && errno != ENOTSUP) {
PLOG(ERROR) << "Failed to set pin_file for f2fs: " << path << " on " << blk_dev;