From: imandevel@gmail.com
To: jack@suse.cz
Cc: amir73il@gmail.com, linux-fsdevel@vger.kernel.org,
linux-kernel@vger.kernel.org, Iman Seyed <ImanDevel@gmail.com>
Subject: [PATCH] inotify: set ret in inotify_read() to -EAGAIN only when O_NONBLOCK is set
Date: Sat, 31 Aug 2024 23:01:50 -0400 [thread overview]
Message-ID: <20240901030150.76054-1-ImanDevel@gmail.com> (raw)
From: Iman Seyed <ImanDevel@gmail.com>
Avoid setting ret to -EAGAIN unnecessarily. Only set
it when O_NONBLOCK is specified; otherwise, leave ret
unchanged and proceed to set it to -ERESTARTSYS.
Signed-off-by: Iman Seyed <ImanDevel@gmail.com>
---
fs/notify/inotify/inotify_user.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/fs/notify/inotify/inotify_user.c b/fs/notify/inotify/inotify_user.c
index 4ffc30606e0b..d5d4b306a33d 100644
--- a/fs/notify/inotify/inotify_user.c
+++ b/fs/notify/inotify/inotify_user.c
@@ -279,9 +279,11 @@ static ssize_t inotify_read(struct file *file, char __user *buf,
continue;
}
- ret = -EAGAIN;
- if (file->f_flags & O_NONBLOCK)
+ if (file->f_flags & O_NONBLOCK) {
+ ret = -EAGAIN;
break;
+ }
+
ret = -ERESTARTSYS;
if (signal_pending(current))
break;
--
2.46.0
next reply other threads:[~2024-09-01 3:01 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-09-01 3:01 imandevel [this message]
2024-09-01 7:00 ` [PATCH] inotify: set ret in inotify_read() to -EAGAIN only when O_NONBLOCK is set Kuan-Wei Chiu
2024-09-01 7:35 ` Iman Seyed
2024-09-02 14:04 ` Jan Kara
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240901030150.76054-1-ImanDevel@gmail.com \
--to=imandevel@gmail.com \
--cc=amir73il@gmail.com \
--cc=jack@suse.cz \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).