ext4 crypto: enable filename encryption
authorMichael Halcrow <mhalcrow@google.com>
Sun, 12 Apr 2015 05:09:05 +0000 (01:09 -0400)
committerTheodore Ts'o <tytso@mit.edu>
Sun, 12 Apr 2015 05:09:05 +0000 (01:09 -0400)
Signed-off-by: Uday Savagaonkar <savagaon@google.com>
Signed-off-by: Ildar Muslukhov <ildarm@google.com>
Signed-off-by: Michael Halcrow <mhalcrow@google.com>
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
fs/ext4/dir.c
fs/ext4/ialloc.c

diff --cc fs/ext4/dir.c
Simple merge
Simple merge