diff options
| author | Mark Brown <broonie@kernel.org> | 2023-07-30 23:38:02 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2023-07-30 23:38:02 +0100 |
| commit | 2cddb06cb020f02a69e4e065599c1e5aa8b4a5d1 (patch) | |
| tree | 411945066af7d953de11184b79b6acf0162964a6 /fs/file.c | |
| parent | 7eb10bfbbae6025cb7b4bba3db0c1281eac05862 (diff) | |
| parent | 5d0c230f1de8c7515b6567d9afba1f196fb4e2f4 (diff) | |
| download | linux-next-2cddb06cb020f02a69e4e065599c1e5aa8b4a5d1.tar.gz linux-next-2cddb06cb020f02a69e4e065599c1e5aa8b4a5d1.zip | |
ASoC: Merge up fixes from Linus' tree
Gets us pine64plus back if nothing else.
Diffstat (limited to 'fs/file.c')
| -rw-r--r-- | fs/file.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/fs/file.c b/fs/file.c index 7893ea161d77..35c62b54c9d6 100644 --- a/fs/file.c +++ b/fs/file.c @@ -1042,10 +1042,8 @@ unsigned long __fdget_pos(unsigned int fd) struct file *file = (struct file *)(v & ~3); if (file && (file->f_mode & FMODE_ATOMIC_POS)) { - if (file_count(file) > 1) { - v |= FDPUT_POS_UNLOCK; - mutex_lock(&file->f_pos_lock); - } + v |= FDPUT_POS_UNLOCK; + mutex_lock(&file->f_pos_lock); } return v; } |