diff options
author | Jonathan Corbet <corbet@lwn.net> | 2009-02-01 22:52:56 +0100 |
---|---|---|
committer | Jonathan Corbet <corbet@lwn.net> | 2009-03-16 15:34:35 +0100 |
commit | 60aa49243d09afc873f082567d2e3c16634ced84 (patch) | |
tree | bb7c8d9668b35a3aa4e90d0a62500ac9d3e67f7f /fs/pipe.c | |
parent | Move FASYNC bit handling to f_op->fasync() (diff) | |
download | linux-60aa49243d09afc873f082567d2e3c16634ced84.tar.xz linux-60aa49243d09afc873f082567d2e3c16634ced84.zip |
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
diff --git a/fs/pipe.c b/fs/pipe.c index 14f502b89cf5..94ad15967cf9 100644 --- a/fs/pipe.c +++ b/fs/pipe.c @@ -667,10 +667,7 @@ pipe_read_fasync(int fd, struct file *filp, int on) retval = fasync_helper(fd, filp, on, &inode->i_pipe->fasync_readers); mutex_unlock(&inode->i_mutex); - if (retval < 0) - return retval; - - return 0; + return retval; } @@ -684,10 +681,7 @@ pipe_write_fasync(int fd, struct file *filp, int on) retval = fasync_helper(fd, filp, on, &inode->i_pipe->fasync_writers); mutex_unlock(&inode->i_mutex); - if (retval < 0) - return retval; - - return 0; + return retval; } @@ -706,11 +700,7 @@ pipe_rdwr_fasync(int fd, struct file *filp, int on) fasync_helper(-1, filp, 0, &pipe->fasync_readers); } mutex_unlock(&inode->i_mutex); - - if (retval < 0) - return retval; - - return 0; + return retval; } |