diff options
author | Al Viro <viro@zeniv.linux.org.uk> | 2013-09-22 16:27:52 -0400 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2013-10-24 23:34:54 -0400 |
commit | 72c2d53192004845cbc19cd8a30b3212a9288140 (patch) | |
tree | 31fcd924438f03d5aa09d13ffd813fb153da37c3 /fs/fcntl.c | |
parent | 22bd002ee76aa7d7a3393f39d977f6c106153c60 (diff) |
file->f_op is never NULL...
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs/fcntl.c')
-rw-r--r-- | fs/fcntl.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/fs/fcntl.c b/fs/fcntl.c index 65343c3741ff..ef6866592a0f 100644 --- a/fs/fcntl.c +++ b/fs/fcntl.c | |||
@@ -56,7 +56,7 @@ static int setfl(int fd, struct file * filp, unsigned long arg) | |||
56 | return -EINVAL; | 56 | return -EINVAL; |
57 | } | 57 | } |
58 | 58 | ||
59 | if (filp->f_op && filp->f_op->check_flags) | 59 | if (filp->f_op->check_flags) |
60 | error = filp->f_op->check_flags(arg); | 60 | error = filp->f_op->check_flags(arg); |
61 | if (error) | 61 | if (error) |
62 | return error; | 62 | return error; |
@@ -64,8 +64,7 @@ static int setfl(int fd, struct file * filp, unsigned long arg) | |||
64 | /* | 64 | /* |
65 | * ->fasync() is responsible for setting the FASYNC bit. | 65 | * ->fasync() is responsible for setting the FASYNC bit. |
66 | */ | 66 | */ |
67 | if (((arg ^ filp->f_flags) & FASYNC) && filp->f_op && | 67 | if (((arg ^ filp->f_flags) & FASYNC) && filp->f_op->fasync) { |
68 | filp->f_op->fasync) { | ||
69 | error = filp->f_op->fasync(fd, filp, (arg & FASYNC) != 0); | 68 | error = filp->f_op->fasync(fd, filp, (arg & FASYNC) != 0); |
70 | if (error < 0) | 69 | if (error < 0) |
71 | goto out; | 70 | goto out; |