The patch titled
fix-wrong-error-code-on-interrupted-close-syscalls fix
has been added to the -mm tree. Its filename is
fix-wrong-error-code-on-interrupted-close-syscalls-fix.patch
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: fix-wrong-error-code-on-interrupted-close-syscalls fix
From: Ernie Petrides <petrides@xxxxxxxxxx>
Roland McGrath has pointed out to me that my original patch for this
problem only handles the case of ERESTARTSYS, but doesn't treat the three
other restart pseudo-error codes similarly.
I don't see how any code currently in the 2.6.17 source tree could possibly
result in any ERESTARTNOINTR, ERESTARTNOHAND, or ERESTART_RESTARTBLOCK
errors being sent back through filp_close().
But if you prefer the extra checks for completeness, feel free to add the
incremental patch below (on top of my previous patch to check for
ERESTARTSYS).
Cc: Roland McGrath <roland@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
fs/open.c | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletion(-)
diff -puN fs/open.c~fix-wrong-error-code-on-interrupted-close-syscalls-fix fs/open.c
--- a/fs/open.c~fix-wrong-error-code-on-interrupted-close-syscalls-fix
+++ a/fs/open.c
@@ -1189,7 +1189,13 @@ asmlinkage long sys_close(unsigned int f
retval = filp_close(filp, files);
/* can't restart close syscall because file table entry was cleared */
- return (retval == -ERESTARTSYS) ? -EINTR : retval;
+ if (unlikely(retval == -ERESTARTSYS ||
+ retval == -ERESTARTNOINTR ||
+ retval == -ERESTARTNOHAND ||
+ retval == -ERESTART_RESTARTBLOCK))
+ retval = -EINTR;
+
+ return retval;
out_unlock:
spin_unlock(&files->file_lock);
_
Patches currently in -mm which might be from petrides@xxxxxxxxxx are
fix-wrong-error-code-on-interrupted-close-syscalls.patch
fix-wrong-error-code-on-interrupted-close-syscalls-fix.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
