---

yaml --- r: 81769 b: refs/heads/master c: da78451 h: refs/heads/master i: 81767: 18623a0 v: v3
git-mirror · Dec 6, 2007 · ec70235 · ec70235
1 parent b1cc1d3
commit ec70235
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ad776537cc6b4b936cfd11893e7b698dfa072666
+refs/heads/master: da78451190bdaae0e67d6c96b1ec3366abc45474
diff --git a/trunk/fs/readdir.c b/trunk/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);