ext4 crypto: sync up the mainline 4.1-rc1 merge
authorTheodore Ts'o <tytso@google.com>
Wed, 29 Apr 2015 16:12:50 +0000 (12:12 -0400)
committerIan Chang <ianc@nvidia.com>
Wed, 1 Jun 2016 05:00:02 +0000 (13:00 +0800)
commit8d3291b84e403dd65e081da42df3f0455f6068c0
tree5f89486f4382034110af0607c54879b6f9d5e334
parentd436736168d887989018dcc34860f5a08f55ae42
ext4 crypto: sync up the mainline 4.1-rc1 merge

There were some last minute changes that weren't reflected in the ext4
crypto patches that we were syncing with flounder.  They were mostly
whitespace changes, plus an error handling bugfix if there was a
normal (non-crypto-related) bugs when adding a directory entry to an
inode while creating a file.

Change-Id: I01e1f8ee07aef2f826a27efcbfa85a825000f2bc
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
Signed-off-by: Theodore Ts'o <tytso@google.com>
fs/ext4/crypto.c
fs/ext4/crypto_fname.c
fs/ext4/ext4.h
fs/ext4/ioctl.c
fs/ext4/namei.c