diff options
| author | Todd Kjos <tkjos@google.com> | 2017-03-20 08:55:18 -0700 |
|---|---|---|
| committer | Todd Kjos <tkjos@google.com> | 2017-03-20 08:57:38 -0700 |
| commit | 77e4e5b8af91b28c8ae69b78422e835c9c1a17fe (patch) | |
| tree | 070155798e1bb0bdc31c510c5e483283d62f1e09 | |
| parent | 83193f99f1be71d6a6095ef56437d0711031854b (diff) | |
| parent | 28ec98bc2e4a175b60f45d505e715a33b93dd077 (diff) | |
resolve merge conflicts of 1c5265be54d3 to android-4.4
Change-Id: Idd5f2956c09b193b2a6ba02410e90b52aa2284d7
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | fs/ext4/inode.c | 3 |
2 files changed, 2 insertions, 3 deletions
@@ -1,6 +1,6 @@ VERSION = 4 PATCHLEVEL = 4 -SUBLEVEL = 54 +SUBLEVEL = 55 EXTRAVERSION = NAME = Blurry Fish Butt diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c index a670f7aa9469..1c733321b03c 100644 --- a/fs/ext4/inode.c +++ b/fs/ext4/inode.c @@ -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; |