Merge branches 'work.lookups', 'work.misc' and 'work.preadv2' into for-next

2016-03-18 16:07:38 -04:00
parent f93812846f ed782b5a70 d6785d9152 8e0b60b96b
commit 8b23a8ce10
33 changed files with 488 additions and 465 deletions
--- a/include/uapi/linux/fs.h
+++ b/include/uapi/linux/fs.h
@@ -304,4 +304,7 @@ struct fsxattr {
 #define SYNC_FILE_RANGE_WRITE		2
 #define SYNC_FILE_RANGE_WAIT_AFTER	4

+/* flags for preadv2/pwritev2: */
+#define RWF_HIPRI			0x00000001 /* high priority request, poll if possible */
+
 #endif /* _UAPI_LINUX_FS_H */