Pull misc filesystem updates from Jan Kara: "udf, ext2, quota, fsnotify fixes & cleanups: - udf fixes for handling of media without uid/gid - udf fixes for some corner cases in parsing of volume recognition sequence - improvements of fsnotify handling of ENOMEM - new ioctl to allow setting of watch descriptor id for inotify (for checkpoint - restart) - small ext2, reiserfs, quota cleanups" * 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs: quota: Kill an unused extern entry form quota.h reiserfs: Remove VLA from fs/reiserfs/reiserfs.h udf: fix potential refcnt problem of nls module ext2: change return code to -ENOMEM when failing memory allocation udf: Do not mark possibly inconsistent filesystems as closed fsnotify: Let userspace know about lost events due to ENOMEM fanotify: Avoid lost events due to ENOMEM for unlimited queues udf: Remove never implemented mount options udf: Update mount option documentation udf: Provide saner default for invalid uid / gid udf: Clean up handling of invalid uid/gid udf: Apply uid/gid mount options also to new inodes & chown udf: Ignore [ug]id=ignore mount options udf: Fix handling of Partition Descriptors udf: Unify common handling of descriptors udf: Convert descriptor index definitions to enum udf: Allow volume descriptor sequence to be terminated by unrecorded block udf: Simplify handling of Volume Descriptor Pointers udf: Fix off-by-one in volume descriptor sequence length inotify: Extend ioctl to allow to request id of new watch descriptor
Showing the changes to include/uapi/linux (1 of 18 files). Show all
Unified · Split
| @@ -71,5 +71,13 @@ struct inotify_event { · 70 unmodified lines | ||
| 71 | 71 | #define IN_CLOEXEC O_CLOEXEC |
| 72 | 72 | #define IN_NONBLOCK O_NONBLOCK |
| 73 | 73 | |
| 74 | +/* | |
| 75 | + * ioctl numbers: inotify uses 'I' prefix for all ioctls, | |
| 76 | + * except historical FIONREAD, which is based on 'T'. | |
| 77 | + * | |
| 78 | + * INOTIFY_IOC_SETNEXTWD: set desired number of next created | |
| 79 | + * watch descriptor. | |
| 80 | + */ | |
| 81 | +#define INOTIFY_IOC_SETNEXTWD _IOW('I', 0, __s32) | |
| 74 | 82 | |
| 75 | 83 | #endif /* _UAPI_LINUX_INOTIFY_H */ |