Hi Jonathan,
Today's linux-next merge of the bkl-removal tree got a conflict in
fs/pipe.c between commit e5bc49ba7439b9726006d031d440cba96819f0f8
("pipe_rdwr_fasync: fix the error handling to prevent the leak/crash")
from Linus' tree and commit 5c7eec1a9b90b18837a45cccb7fe3c182dce57d0
("Rationalize fasync return values") from the bkl-removal tree.
I fixed it up (see below) and can carry the fix for a while.
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/
diff --cc fs/pipe.c
index 14f502b,900de67..0000000
--- a/fs/pipe.c
+++ b/fs/pipe.c
@@@ -699,18 -693,13 +693,14 @@@ pipe_rdwr_fasync(int fd, struct file *f
int retval;
mutex_lock(&inode->i_mutex);
-
retval = fasync_helper(fd, filp, on, &pipe->fasync_readers);
- if (retval >= 0)
+ if (retval >= 0) {
retval = fasync_helper(fd, filp, on, &pipe->fasync_writers);
-
+ if (retval < 0) /* this can happen only if on == T */
+ fasync_helper(-1, filp, 0, &pipe->fasync_readers);
+ }
mutex_unlock(&inode->i_mutex);
-
- if (retval < 0)
- return retval;
-
- return 0;
+ return retval;
}
--
To unsubscribe from this list: send the line "unsubscribe linux-next" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
