Pull file locking updates from Jeff Layton: "Most of this is just follow-on cleanup work of documentation and comments from the mandatory locking removal in v5.15. The only real functional change is that LOCK_MAND flock() support is also being removed, as it has basically been non-functional since the v2.5 days" * tag 'locks-v5.16' of git://git.kernel.org/pub/scm/linux/kernel/git/jlayton/linux: fs: remove leftover comments from mandatory locking removal locks: remove changelog comments docs: fs: locks.rst: update comment about mandatory file locking Documentation: remove reference to now removed mandatory-locking doc locks: remove LOCK_MAND flock lock support
Showing the changes to include/uapi (1 of 9 files). Show all
Unified · Split
| @@ -181,6 +181,10 @@ struct f_owner_ex { · 180 unmodified lines | |||
| 181 | blocking */ | 181 | blocking */ |
| 182 | #define LOCK_UN 8 /* remove lock */ | 182 | #define LOCK_UN 8 /* remove lock */ |
| 183 | 183 | ||
| 184 | /* | ||
| 185 | * LOCK_MAND support has been removed from the kernel. We leave the symbols | ||
| 186 | * here to not break legacy builds, but these should not be used in new code. | ||
| 187 | */ | ||
| 184 | #define LOCK_MAND 32 /* This is a mandatory flock ... */ | 188 | #define LOCK_MAND 32 /* This is a mandatory flock ... */ |
| 185 | #define LOCK_READ 64 /* which allows concurrent read operations */ | 189 | #define LOCK_READ 64 /* which allows concurrent read operations */ |
| 186 | #define LOCK_WRITE 128 /* which allows concurrent write operations */ | 190 | #define LOCK_WRITE 128 /* which allows concurrent write operations */ |