X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=fs%2Freaddir.c;h=4e026e5407fb7516c3a52c8533f0159b6b7ecdd9;hb=6924d1ab8b7bbe5ab416713f5701b3316b2df85b;hp=efe52e67657719963d5ac1cd22df34e7465d4234;hpb=393bfca19ecdce60a8d9a4d2577cac11ca924a25;p=linux-2.6

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);