Merge tag 'ecryptfs-3.18-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 11 Oct 2014 12:01:27 +0000 (08:01 -0400)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 11 Oct 2014 12:01:27 +0000 (08:01 -0400)
commiteca9fdf32dd48976eab18d310acb0b8d4cc9bf26
tree54d6e8fd0fb3bb69a012953dbb180bdcb11d9822
parent41e46ac0fae9583d81e6b148329fec627d192181
parent0f9e2bf008a1b143973a01b52320eb66c20ac6ab
Merge tag 'ecryptfs-3.18-fixes' of git://git./linux/kernel/git/tyhicks/ecryptfs

Pull eCryptfs updates from Tyler Hicks:
 "Minor code cleanups and a fix for when eCryptfs metadata is stored in
  xattrs"

* tag 'ecryptfs-3.18-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tyhicks/ecryptfs:
  ecryptfs: remove unneeded buggy code in ecryptfs_do_create()
  ecryptfs: avoid to access NULL pointer when write metadata in xattr
  ecryptfs: remove unnecessary break after goto
  ecryptfs: Remove unnecessary include of syscall.h in keystore.c
  fs/ecryptfs/messaging.c: remove null test before kfree
  ecryptfs: Drop cast
  Use %pd in eCryptFS
fs/ecryptfs/file.c
fs/ecryptfs/inode.c