x86: bitops asm constraint fixes

[sfrench/cifs-2.6.git] / fs / readdir.c

diff --git a/fs/readdir.c b/fs/readdir.c
index efe52e67657719963d5ac1cd22df34e7465d4234..4e026e5407fb7516c3a52c8533f0159b6b7ecdd9 100644 (file)
--- 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);