diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2018-10-12 06:35:30 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2018-10-12 06:35:30 +0000 |
| commit | bc2be82a7f52610f4462b0f0fc161628301c6723 (patch) | |
| tree | 65a22ef6fdff14eed2673afad2b88c13603ccbb5 | |
| parent | 43c407443ce8bb128fd00616c1980c83d863f2be (diff) | |
| parent | 8eeaf97d2305f50656608bce74d1d85b5a45ef79 (diff) | |
| download | android_bootable_recovery-bc2be82a7f52610f4462b0f0fc161628301c6723.tar.gz android_bootable_recovery-bc2be82a7f52610f4462b0f0fc161628301c6723.tar.bz2 android_bootable_recovery-bc2be82a7f52610f4462b0f0fc161628301c6723.zip | |
Merge "uncrypt: fix f2fs ioctl argument for pin_file" into pie-gsi
| -rw-r--r-- | uncrypt/uncrypt.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/uncrypt/uncrypt.cpp b/uncrypt/uncrypt.cpp index 16036f9c..95f40c71 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; |