diff options
| author | Kirill Smelkov <kirr@nexedi.com> | 2019-03-27 09:33:01 +0100 |
|---|---|---|
| committer | Kirill Smelkov <kirr@nexedi.com> | 2019-05-06 16:45:51 +0200 |
| commit | 184012ad69b275a17d6fa40a8d4dcf15ef76c4d2 (patch) | |
| tree | a9e4fa265380cbec647d7609dc6a950357ed4852 | |
| parent | Linux 5.1 (diff) | |
| download | linux-184012ad69b275a17d6fa40a8d4dcf15ef76c4d2.tar.xz linux-184012ad69b275a17d6fa40a8d4dcf15ef76c4d2.zip | |
dtlk: remove double call to nonseekable_open
dtlk_open currently has 2 calls to nonseekable_open which are both
executed on success path. It was not hurting to make the extra call as
nonseekable_open is only changing file->f_flags in idempotent way.
However the first nonseekable_open is indeed both unneeded and looks
suspicious.
The first nonseekable_open was added in 6244f13c51 ("Fix up a couple of
drivers - notable sg - for nonseekability."; 2004-Aug-7). The second
nonseekable_open call was introduced in dc5c724584 ("Remove ESPIPE logic
from drivers, letting the VFS layer handle it instead.; 2004-Aug-8). The
latter patch being mass change probably missed to remove
nonseekable_open that was introduced into dtlk_open the day before.
Fix it: remove the extra/unneeded nonseekable_open call and leave the
call to nonseekable_open only on the path where we are actually opening
the file.
Suggested-by: Pavel Machek <pavel@denx.de>
Signed-off-by: Kirill Smelkov <kirr@nexedi.com>
| -rw-r--r-- | drivers/char/dtlk.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/char/dtlk.c b/drivers/char/dtlk.c index f882460b5a44..669c3311adc4 100644 --- a/drivers/char/dtlk.c +++ b/drivers/char/dtlk.c @@ -298,7 +298,6 @@ static int dtlk_open(struct inode *inode, struct file *file) { TRACE_TEXT("(dtlk_open"); - nonseekable_open(inode, file); switch (iminor(inode)) { case DTLK_MINOR: if (dtlk_busy) |