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

am: 4adfcf962f

Change-Id: I2efec91672b2772fdde4d7f474e7366f7f5c07a8
This commit is contained in:
Jaegeuk Kim
2018-08-01 00:31:21 -07:00
committed by android-build-merger
+2 -1
View File
@@ -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;