shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-09 12:17:12 +09:00
Code Issues Packages Projects Releases Wiki Activity

resolve merge conflicts of 1c5265be54 to android-4.4

Browse Source 
Change-Id: Idd5f2956c09b193b2a6ba02410e90b52aa2284d7
This commit is contained in:
Todd Kjos
2017-03-20 08:55:18 -07:00
parent 83193f99f1 28ec98bc2e
commit 77e4e5b8af
2 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@@ -1,6 +1,6 @@
VERSION = 4
PATCHLEVEL = 4
SUBLEVEL = 54
SUBLEVEL = 55
EXTRAVERSION =
NAME = Blurry Fish Butt

3
fs/ext4/inode.c
View File

@@ -3627,8 +3627,7 @@ static int ext4_block_truncate_page(handle_t *handle,
unsigned blocksize;
struct inode *inode = mapping->host;
/* If we are processing an encrypted inode during orphan list
* handling */
/* If we are processing an encrypted inode during orphan list handling */
if (ext4_encrypted_inode(inode) && !ext4_has_encryption_key(inode))
return 0;