projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
ad77653
)
Use mutex_lock_killable in vfs_readdir
author
Liam R. Howlett
<howlett@gmail.com>
Thu, 6 Dec 2007 22:39:54 +0000
(17:39 -0500)
committer
Matthew Wilcox
<willy@linux.intel.com>
Thu, 6 Dec 2007 22:39:54 +0000
(17:39 -0500)
Signed-off-by: Liam R. Howlett <howlett@gmail.com>
Acked-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Matthew Wilcox <willy@linux.intel.com>
fs/readdir.c
patch
|
blob
|
history
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);