commit e0b4784c098c994ea5b0fab7e011e30addf641eb
author Jaegeuk Kim <jaegeuk@google.com> Wed Aug 01 00:31:21 2018 -0700
committer android-build-merger <android-build-merger@google.com> Wed Aug 01 00:31:21 2018 -0700
tree 3dc6b6c727dc61a8762979d6237315987edd28ac
parent e32cd9bc1a4c50d819b8c5e112c28b73c11a6ecd
parent 4adfcf962fcf0c2cf68c0c3b268a485aee8284f1

Merge "uncrypt: fix f2fs ioctl argument for pin_file" am: 42f40cd370 am: 03f6185ea6
am: 4adfcf962f

Change-Id: I2efec91672b2772fdde4d7f474e7366f7f5c07a8

uncrypt/uncrypt.cpp

diff --git a/uncrypt/uncrypt.cpp b/uncrypt/uncrypt.cpp
index 16036f9..95f40c7 100644
--- a/uncrypt/uncrypt.cpp
+++ b/uncrypt/uncrypt.cpp
@@ -332,7 +332,8 @@
 #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;