The patch titled
vfs: use mutex_lock_killable() in vfs_readdir()
has been added to the -mm tree. Its filename is
vfs-use-mutex_lock_killable-in-vfs_readdir.patch
*** Remember to use Documentation/SubmitChecklist when testing your code ***
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: vfs: use mutex_lock_killable() in vfs_readdir()
From: "Liam R. Howlett" <howlett@xxxxxxxxx>
Signed-off-by: Liam R. Howlett <howlett@xxxxxxxxx>
Acked-by: Matthew Wilcox <willy@xxxxxxxxxxxxxxx>
Cc: Trond Myklebust <trond.myklebust@xxxxxxxxxx>
Cc: "J. Bruce Fields" <bfields@xxxxxxxxxxxx>
Cc: Ingo Molnar <mingo@xxxxxxx>
Cc: Peter Zijlstra <a.p.zijlstra@xxxxxxxxx>
Cc: Al Viro <viro@xxxxxxxxxxxxxxxxxx>
Cc: Christoph Hellwig <hch@xxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
fs/readdir.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff -puN fs/readdir.c~vfs-use-mutex_lock_killable-in-vfs_readdir fs/readdir.c
--- a/fs/readdir.c~vfs-use-mutex_lock_killable-in-vfs_readdir
+++ a/fs/readdir.c
@@ -30,7 +30,10 @@ int vfs_readdir(struct file *file, filld
if (res)
goto out;
- mutex_lock(&inode->i_mutex);
+ res = -EINTR;
+ if (mutex_lock_killable(&inode->i_mutex))
+ goto out;
+
res = -ENOENT;
if (!IS_DEADDIR(inode)) {
res = file->f_op->readdir(file, buf, filler);
_
Patches currently in -mm which might be from howlett@xxxxxxxxx are
kernel-add-mutex_lock_killable.patch
vfs-use-mutex_lock_killable-in-vfs_readdir.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
