Skip to content
  • Linus Torvalds's avatar
    Merge tag 'ecryptfs-3.6-rc1-fixes' of... · 410fc4ce
    Linus Torvalds authored
    Merge tag 'ecryptfs-3.6-rc1-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tyhicks/ecryptfs
    
    Pull ecryptfs fixes from Tyler Hicks:
     - Fixes a bug when the lower filesystem mount options include 'acl',
       but the eCryptfs mount options do not
     - Cleanups in the messaging code
     - Better handling of empty files in the lower filesystem to improve
       usability.  Failed file creations are now cleaned up and empty lower
       files are converted into eCryptfs during open().
     - The write-through cache changes are being reverted due to bugs that
       are not easy to fix.  Stability outweighs the performance
       enhancements here.
     - Improvement to the mount code to catch unsupported ciphers specified
       in the mount options
    
    * tag 'ecryptfs-3.6-rc1-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tyhicks/ecryptfs:
      eCryptfs: check for eCryptfs cipher support at mount
      eCryptfs: Revert to a writethrough cache model
      eCryptfs: Initialize empty lower files when opening them
      eCryptfs: Unlink lower inode when ecryptfs_create() fails
      eCryptfs: Make all miscdev functions use daemon ptr in file private_data
      eCryptfs: Remove unused messaging declarations and function
      eCryptfs: Copy up POSIX ACL and read-only flags from lower mount
    410fc4ce