Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=da78451190bdaae0e67d6c96b1ec3366abc45474
Commit:     da78451190bdaae0e67d6c96b1ec3366abc45474
Parent:     ad776537cc6b4b936cfd11893e7b698dfa072666
Author:     Liam R. Howlett <[EMAIL PROTECTED]>
AuthorDate: Thu Dec 6 17:39:54 2007 -0500
Committer:  Matthew Wilcox <[EMAIL PROTECTED]>
CommitDate: Thu Dec 6 17:39:54 2007 -0500

    Use mutex_lock_killable in vfs_readdir
    
    Signed-off-by: Liam R. Howlett <[EMAIL PROTECTED]>
    Acked-by: Ingo Molnar <[EMAIL PROTECTED]>
    Signed-off-by: Matthew Wilcox <[EMAIL PROTECTED]>
---
 fs/readdir.c |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/fs/readdir.c b/fs/readdir.c
index efe52e6..4e026e5 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);
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to