From 55f335a8857db2ee22c068e7ab7141fc79928296 Mon Sep 17 00:00:00 2001 From: Linus Torvalds Date: Wed, 27 Oct 2010 18:17:02 -0700 Subject: [PATCH] fasync: Fix placement of FASYNC flag comment In commit f7347ce4ee7c ("fasync: re-organize fasync entry insertion to allow it under a spinlock") Arnd took an earlier patch of mine that had the comment about the FASYNC flag above the wrong function. When the fasync_add_entry() function was split to introduce the new fasync_insert_entry() helper function, the code that actually cares about the FASYNC bit moved to that new helper. So just move the comment to the right point. Signed-off-by: Linus Torvalds --- fs/fcntl.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/fs/fcntl.c b/fs/fcntl.c index dcdbc6f..ecc8b39 100644 --- a/fs/fcntl.c +++ b/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 @@ out: /* * 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) { -- 2.7.4