From: Liam R. Howlett <howlett@gmail.com>
Date: Thu, 6 Dec 2007 22:39:54 +0000 (-0500)
Subject: Use mutex_lock_killable in vfs_readdir
X-Git-Tag: v2.6.25-rc1~1125^2~5
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=da78451190bdaae0e67d6c96b1ec3366abc45474;p=linux-2.6

Use mutex_lock_killable in vfs_readdir

Signed-off-by: Liam R. Howlett <howlett@gmail.com>
Acked-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Matthew Wilcox <willy@linux.intel.com>
---

diff --git a/fs/readdir.c b/fs/readdir.c
index efe52e6765..4e026e5407 100644
--- a/fs/readdir.c
+++ b/fs/readdir.c
@@ -30,7 +30,10 @@ int vfs_readdir(struct file *file, filldir_t filler, void *buf)
 	if (res)
 		goto out;
 
-	mutex_lock(&inode->i_mutex);
+	res = mutex_lock_killable(&inode->i_mutex);
+	if (res)
+		goto out;
+
 	res = -ENOENT;
 	if (!IS_DEADDIR(inode)) {
 		res = file->f_op->readdir(file, buf, filler);