diff options
author | Jonathan Corbet <corbet@lwn.net> | 2009-02-01 16:52:56 -0500 |
---|---|---|
committer | Jonathan Corbet <corbet@lwn.net> | 2009-03-16 10:34:35 -0400 |
commit | 60aa49243d09afc873f082567d2e3c16634ced84 (patch) | |
tree | bb7c8d9668b35a3aa4e90d0a62500ac9d3e67f7f /fs/pipe.c | |
parent | 76398425bb06b07cc3a3b1ce169c67dc9d6874ed (diff) |
Rationalize fasync return values
Most fasync implementations do something like:
return fasync_helper(...);
But fasync_helper() will return a positive value at times - a feature used
in at least one place. Thus, a number of other drivers do:
err = fasync_helper(...);
if (err < 0)
return err;
return 0;
In the interests of consistency and more concise code, it makes sense to
map positive return values onto zero where ->fasync() is called.
Cc: Al Viro <viro@ZenIV.linux.org.uk>
Signed-off-by: Jonathan Corbet <corbet@lwn.net>
Diffstat (limited to 'fs/pipe.c')
-rw-r--r-- | fs/pipe.c | 16 |
1 files changed, 3 insertions, 13 deletions
@@ -667,10 +667,7 @@ pipe_read_fasync(int fd, struct file *filp, int on) | |||
667 | retval = fasync_helper(fd, filp, on, &inode->i_pipe->fasync_readers); | 667 | retval = fasync_helper(fd, filp, on, &inode->i_pipe->fasync_readers); |
668 | mutex_unlock(&inode->i_mutex); | 668 | mutex_unlock(&inode->i_mutex); |
669 | 669 | ||
670 | if (retval < 0) | 670 | return retval; |
671 | return retval; | ||
672 | |||
673 | return 0; | ||
674 | } | 671 | } |
675 | 672 | ||
676 | 673 | ||
@@ -684,10 +681,7 @@ pipe_write_fasync(int fd, struct file *filp, int on) | |||
684 | retval = fasync_helper(fd, filp, on, &inode->i_pipe->fasync_writers); | 681 | retval = fasync_helper(fd, filp, on, &inode->i_pipe->fasync_writers); |
685 | mutex_unlock(&inode->i_mutex); | 682 | mutex_unlock(&inode->i_mutex); |
686 | 683 | ||
687 | if (retval < 0) | 684 | return retval; |
688 | return retval; | ||
689 | |||
690 | return 0; | ||
691 | } | 685 | } |
692 | 686 | ||
693 | 687 | ||
@@ -706,11 +700,7 @@ pipe_rdwr_fasync(int fd, struct file *filp, int on) | |||
706 | fasync_helper(-1, filp, 0, &pipe->fasync_readers); | 700 | fasync_helper(-1, filp, 0, &pipe->fasync_readers); |
707 | } | 701 | } |
708 | mutex_unlock(&inode->i_mutex); | 702 | mutex_unlock(&inode->i_mutex); |
709 | 703 | return retval; | |
710 | if (retval < 0) | ||
711 | return retval; | ||
712 | |||
713 | return 0; | ||
714 | } | 704 | } |
715 | 705 | ||
716 | 706 | ||