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/fcntl.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/fcntl.c')
-rw-r--r-- | fs/fcntl.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/fs/fcntl.c b/fs/fcntl.c index 431bb6459273..d865ca66ccba 100644 --- a/fs/fcntl.c +++ b/fs/fcntl.c @@ -184,6 +184,8 @@ static int setfl(int fd, struct file * filp, unsigned long arg) error = filp->f_op->fasync(fd, filp, (arg & FASYNC) != 0); if (error < 0) goto out; + if (error > 0) + error = 0; } spin_lock(&filp->f_lock); filp->f_flags = (arg & SETFL_MASK) | (filp->f_flags & ~SETFL_MASK); |