The patch titled ecryptfs: redo dget,mntget on dentry_open failure has been removed from the -mm tree. Its filename was ecryptfs-redo-dgetmntget-on-dentry_open-failure.patch This patch was dropped because it was merged into mainline or a subsystem tree The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: ecryptfs: redo dget,mntget on dentry_open failure From: Eric Sandeen <sandeen@xxxxxxxxxx> Thanks to Jeff Moyer for pointing this out. If the RDWR dentry_open() in ecryptfs_init_persistent_file fails, it will do a dput/mntput. Need to re-take references if we retry as RDONLY. Signed-off-by: Eric Sandeen <sandeen@xxxxxxxxxx> Acked-by: Mike Halcrow <mhalcrow@xxxxxxxxxx> Signed-off-by: Jeff Moyer <jmoyer@xxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- fs/ecryptfs/main.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff -puN fs/ecryptfs/main.c~ecryptfs-redo-dgetmntget-on-dentry_open-failure fs/ecryptfs/main.c --- a/fs/ecryptfs/main.c~ecryptfs-redo-dgetmntget-on-dentry_open-failure +++ a/fs/ecryptfs/main.c @@ -138,11 +138,14 @@ int ecryptfs_init_persistent_file(struct inode_info->lower_file = dentry_open(lower_dentry, lower_mnt, (O_RDWR | O_LARGEFILE)); - if (IS_ERR(inode_info->lower_file)) + if (IS_ERR(inode_info->lower_file)) { + dget(lower_dentry); + mntget(lower_mnt); inode_info->lower_file = dentry_open(lower_dentry, lower_mnt, (O_RDONLY | O_LARGEFILE)); + } if (IS_ERR(inode_info->lower_file)) { printk(KERN_ERR "Error opening lower persistent file " "for lower_dentry [0x%p] and lower_mnt [0x%p]\n", _ Patches currently in -mm which might be from sandeen@xxxxxxxxxx are hfs-handle-more-on-disk-corruptions-without-oopsing.patch hfs-handle-more-on-disk-corruptions-without-oopsing-fix.patch git-kbuild.patch ext2-change-the-default-behaviour-on-error.patch export-iov_shorten-for-ext4s-use.patch export-iov_shorten-for-ext4s-use-fix.patch ecryptfs-make-show_options-reflect-actual-mount-options.patch ecryptfs-make-show_options-reflect-actual-mount-options-fix.patch ecryptfs-remove-debug-as-mount-option-and-warn-if-set-via-modprobe.patch ext4-mm-ext4_store_maxbytes_for_bitmaped_files-warning-fix.patch ext3-change-the-default-behaviour-on-error.patch - To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html