X-Git-Url: http://git.cascardo.info/?a=blobdiff_plain;f=fs%2Freaddir.c;h=4e026e5407fb7516c3a52c8533f0159b6b7ecdd9;hb=c32c2f63a9d6c953aaf168c0b2551da9734f76d2;hp=efe52e67657719963d5ac1cd22df34e7465d4234;hpb=5c34202b8bf942da411b6599668a76b07449bbfd;p=cascardo%2Flinux.git

diff --git a/fs/readdir.c b/fs/readdir.c
index efe52e676577..4e026e5407fb 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);