From af1210c411b3199ae0da6cfa568babc806270006 Mon Sep 17 00:00:00 2001 From: Eric Sandeen Date: Sat, 22 Dec 2007 14:03:26 -0800 Subject: [PATCH] --- yaml --- r: 75152 b: refs/heads/master c: 16317ec2e5a85884fea680d24c1b228a5602159f h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/fs/ecryptfs/main.c | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 429ce29f7ff2..84dcd0b7a943 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c8161f64ccdcc3ac05c7bbfebc031e7ad5ca6412 +refs/heads/master: 16317ec2e5a85884fea680d24c1b228a5602159f diff --git a/trunk/fs/ecryptfs/main.c b/trunk/fs/ecryptfs/main.c index a277754da171..e5580bcb923a 100644 --- a/trunk/fs/ecryptfs/main.c +++ b/trunk/fs/ecryptfs/main.c @@ -138,11 +138,14 @@ int ecryptfs_init_persistent_file(struct dentry *ecryptfs_dentry) 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",