Merge branch 'bkl-removal' of git://git.lwn.net/linux-2.6
* 'bkl-removal' of git://git.lwn.net/linux-2.6: Rationalize fasync return values Move FASYNC bit handling to f_op->fasync() Use f_lock to protect f_flags Rename struct file->f_ep_lock
This commit is contained in:
@@ -1074,6 +1074,13 @@ static int sock_fasync(int fd, struct file *filp, int on)
|
||||
|
||||
lock_sock(sk);
|
||||
|
||||
spin_lock(&filp->f_lock);
|
||||
if (on)
|
||||
filp->f_flags |= FASYNC;
|
||||
else
|
||||
filp->f_flags &= ~FASYNC;
|
||||
spin_unlock(&filp->f_lock);
|
||||
|
||||
prev = &(sock->fasync_list);
|
||||
|
||||
for (fa = *prev; fa != NULL; prev = &fa->fa_next, fa = *prev)
|
||||
|
Reference in New Issue
Block a user