History

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

David S. Miller committed 10 years ago

Commit 8eed1cd2 parents 687d911 29fbff8436 files · +22932 −7660Browse files

Showing the changes to include/uapi (3 of 436 files). Show all

Unified · Split

3 files
  1. include/uapi/linux/falloc.h +18 −0
  2. include/uapi/linux/fs.h +3 −1
  3. include/uapi/linux/nfs4.h +3 −2
include/uapi/linux/falloc.h+18−0
@@ -58,4 +58,22 @@ · 57 unmodified lines
58 */58 */
59#define FALLOC_FL_INSERT_RANGE 0x2059#define FALLOC_FL_INSERT_RANGE 0x20
60 60
61/*
62 * FALLOC_FL_UNSHARE_RANGE is used to unshare shared blocks within the
63 * file size without overwriting any existing data. The purpose of this
64 * call is to preemptively reallocate any blocks that are subject to
65 * copy-on-write.
66 *
67 * Different filesystems may implement different limitations on the
68 * granularity of the operation. Most will limit operations to filesystem
69 * block size boundaries, but this boundary may be larger or smaller
70 * depending on the filesystem and/or the configuration of the filesystem
71 * or file.
72 *
73 * This flag can only be used with allocate-mode fallocate, which is
74 * to say that it cannot be used with the punch, zero, collapse, or
75 * insert range modes.
76 */
77#define FALLOC_FL_UNSHARE_RANGE 0x40
78
61#endif /* _UAPI_FALLOC_H_ */79#endif /* _UAPI_FALLOC_H_ */
include/uapi/linux/fs.h+3−1
@@ -158,7 +158,8 @@ struct fsxattr { · 157 unmodified lines
158 __u32 fsx_extsize; /* extsize field value (get/set)*/158 __u32 fsx_extsize; /* extsize field value (get/set)*/
159 __u32 fsx_nextents; /* nextents field value (get) */159 __u32 fsx_nextents; /* nextents field value (get) */
160 __u32 fsx_projid; /* project identifier (get/set) */160 __u32 fsx_projid; /* project identifier (get/set) */
161 unsigned char fsx_pad[12];161 __u32 fsx_cowextsize; /* CoW extsize field value (get/set)*/
162 unsigned char fsx_pad[8];
162};163};
163 164
164/*165/*
@@ -179,6 +180,7 @@ struct fsxattr { · 14 unmodified lines
179#define FS_XFLAG_NODEFRAG 0x00002000 /* do not defragment */180#define FS_XFLAG_NODEFRAG 0x00002000 /* do not defragment */
180#define FS_XFLAG_FILESTREAM 0x00004000 /* use filestream allocator */181#define FS_XFLAG_FILESTREAM 0x00004000 /* use filestream allocator */
181#define FS_XFLAG_DAX 0x00008000 /* use DAX for IO */182#define FS_XFLAG_DAX 0x00008000 /* use DAX for IO */
183#define FS_XFLAG_COWEXTSIZE 0x00010000 /* CoW extent size allocator hint */
182#define FS_XFLAG_HASATTR 0x80000000 /* no DIFLAG for this */184#define FS_XFLAG_HASATTR 0x80000000 /* no DIFLAG for this */
183 185
184/* the read-only stuff doesn't really belong here, but any other place is186/* the read-only stuff doesn't really belong here, but any other place is
include/uapi/linux/nfs4.h+3−2
@@ -39,8 +39,9 @@ · 38 unmodified lines
39#define NFS4_FH_VOL_MIGRATION 0x000439#define NFS4_FH_VOL_MIGRATION 0x0004
40#define NFS4_FH_VOL_RENAME 0x000840#define NFS4_FH_VOL_RENAME 0x0008
41 41
42#define NFS4_OPEN_RESULT_CONFIRM 0x000242#define NFS4_OPEN_RESULT_CONFIRM 0x0002
43#define NFS4_OPEN_RESULT_LOCKTYPE_POSIX 0x000443#define NFS4_OPEN_RESULT_LOCKTYPE_POSIX 0x0004
44#define NFS4_OPEN_RESULT_MAY_NOTIFY_LOCK 0x0020
44 45
45#define NFS4_SHARE_ACCESS_MASK 0x000F46#define NFS4_SHARE_ACCESS_MASK 0x000F
46#define NFS4_SHARE_ACCESS_READ 0x000147#define NFS4_SHARE_ACCESS_READ 0x0001

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t