PawletOS/android_bootable_recovery
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "uncrypt: fix f2fs ioctl argument for pin_file"

Browse Source 
am: 42f40cd370

Change-Id: I54a58ded52eb11cc6ba2834feda3ad22f4658407
This commit is contained in:
Jaegeuk Kim
2018-08-01 00:22:16 -07:00
committed by android-build-merger
parent 3528139409 42f40cd370
commit 03f6185ea6
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
uncrypt/uncrypt.cpp
+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) #define F2FS_IOC_GET_PIN_FILE _IOW(F2FS_IOCTL_MAGIC, 14, __u32)
#endif #endif
if (f2fs_fs) { 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. // Don't break the old kernels which don't support it.
if (error && errno != ENOTTY && errno != ENOTSUP) { if (error && errno != ENOTTY && errno != ENOTSUP) {
PLOG(ERROR) << "Failed to set pin_file for f2fs: " << path << " on " << blk_dev; PLOG(ERROR) << "Failed to set pin_file for f2fs: " << path << " on " << blk_dev;