diff --git a/[refs] b/[refs] index 37fd02ef7a66..0b0dad69afb2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7420a8c0de8d99b201aeeab6fed16ca95ebf55a5 +refs/heads/master: 55f335a8857db2ee22c068e7ab7141fc79928296 diff --git a/trunk/fs/fcntl.c b/trunk/fs/fcntl.c index dcdbc6f5c33b..ecc8b3954ed6 100644 --- a/trunk/fs/fcntl.c +++ b/trunk/fs/fcntl.c @@ -684,6 +684,9 @@ void fasync_free(struct fasync_struct *new) /* * Insert a new entry into the fasync list. Return the pointer to the * old one if we didn't use the new one. + * + * NOTE! It is very important that the FASYNC flag always + * match the state "is the filp on a fasync list". */ struct fasync_struct *fasync_insert_entry(int fd, struct file *filp, struct fasync_struct **fapp, struct fasync_struct *new) { @@ -718,9 +721,6 @@ struct fasync_struct *fasync_insert_entry(int fd, struct file *filp, struct fasy /* * Add a fasync entry. Return negative on error, positive if * added, and zero if did nothing but change an existing one. - * - * NOTE! It is very important that the FASYNC flag always - * match the state "is the filp on a fasync list". */ static int fasync_add_entry(int fd, struct file *filp, struct fasync_struct **fapp) {