tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

fuse: fix flock breakage

Commit 37fb3a30b4 ("fuse: fix flock") added in 3.1-rc4 caused flock() to
fail with ENOSYS with the kernel ABI version 7.16 or earlier.

Fix by falling back to testing FUSE_POSIX_LOCKS for ABI versions 7.16
and earlier.

Reported-by: Martin Ziegler <ziegler@email.mathematik.uni-freiburg.de>
Signed-off-by: Miklos Szeredi <mszeredi@suse.cz>
Tested-by: Martin Ziegler <ziegler@email.mathematik.uni-freiburg.de>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

authored by

Miklos Szeredi and committed by
Linus Torvalds 24114504 87adf1c6

+3
+3
fs/fuse/inode.c
··· 812 812 if (arg->minor >= 17) { 813 813 if (!(arg->flags & FUSE_FLOCK_LOCKS)) 814 814 fc->no_flock = 1; 815 + } else { 816 + if (!(arg->flags & FUSE_POSIX_LOCKS)) 817 + fc->no_flock = 1; 815 818 } 816 819 if (arg->flags & FUSE_ATOMIC_O_TRUNC) 817 820 fc->atomic_o_trunc = 1;