diff options
Diffstat (limited to 'fs/ecryptfs/miscdev.c')
| -rw-r--r-- | fs/ecryptfs/miscdev.c | 2 | 
1 files changed, 2 insertions, 0 deletions
diff --git a/fs/ecryptfs/miscdev.c b/fs/ecryptfs/miscdev.c index 788995efd1d3..6560da1a58ce 100644 --- a/fs/ecryptfs/miscdev.c +++ b/fs/ecryptfs/miscdev.c  | |||
| @@ -257,12 +257,14 @@ ecryptfs_miscdev_read(struct file *file, char __user *buf, size_t count, | |||
| 257 | mutex_lock(&daemon->mux); | 257 | mutex_lock(&daemon->mux); | 
| 258 | if (daemon->flags & ECRYPTFS_DAEMON_ZOMBIE) { | 258 | if (daemon->flags & ECRYPTFS_DAEMON_ZOMBIE) { | 
| 259 | rc = 0; | 259 | rc = 0; | 
| 260 | mutex_unlock(&ecryptfs_daemon_hash_mux); | ||
| 260 | printk(KERN_WARNING "%s: Attempt to read from zombified " | 261 | printk(KERN_WARNING "%s: Attempt to read from zombified " | 
| 261 | "daemon\n", __func__); | 262 | "daemon\n", __func__); | 
| 262 | goto out_unlock_daemon; | 263 | goto out_unlock_daemon; | 
| 263 | } | 264 | } | 
| 264 | if (daemon->flags & ECRYPTFS_DAEMON_IN_READ) { | 265 | if (daemon->flags & ECRYPTFS_DAEMON_IN_READ) { | 
| 265 | rc = 0; | 266 | rc = 0; | 
| 267 | mutex_unlock(&ecryptfs_daemon_hash_mux); | ||
| 266 | goto out_unlock_daemon; | 268 | goto out_unlock_daemon; | 
| 267 | } | 269 | } | 
| 268 | /* This daemon will not go away so long as this flag is set */ | 270 | /* This daemon will not go away so long as this flag is set */ | 
