diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2012-10-30 03:20:56 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2012-10-30 03:20:56 -0400 |
| commit | 53279f36dccffc26ff536003fd6bb97cc21c3b82 (patch) | |
| tree | 9d16e497c0e4158c7c054c479bd0e9ff0388d7bb /include/linux/falloc.h | |
| parent | a6e8c0a25377e27958b11b20e1927885ae7c9857 (diff) | |
| parent | 8f0d8163b50e01f398b14bcd4dc039ac5ab18d64 (diff) | |
Merge tag 'v3.7-rc3' into next to sync up with recent USB and MFD changes
Diffstat (limited to 'include/linux/falloc.h')
| -rw-r--r-- | include/linux/falloc.h | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/include/linux/falloc.h b/include/linux/falloc.h index 73e0b628e058..31591686ac2d 100644 --- a/include/linux/falloc.h +++ b/include/linux/falloc.h | |||
| @@ -1,10 +1,8 @@ | |||
| 1 | #ifndef _FALLOC_H_ | 1 | #ifndef _FALLOC_H_ |
| 2 | #define _FALLOC_H_ | 2 | #define _FALLOC_H_ |
| 3 | 3 | ||
| 4 | #define FALLOC_FL_KEEP_SIZE 0x01 /* default is extend size */ | 4 | #include <uapi/linux/falloc.h> |
| 5 | #define FALLOC_FL_PUNCH_HOLE 0x02 /* de-allocates range */ | ||
| 6 | 5 | ||
| 7 | #ifdef __KERNEL__ | ||
| 8 | 6 | ||
| 9 | /* | 7 | /* |
| 10 | * Space reservation ioctls and argument structure | 8 | * Space reservation ioctls and argument structure |
| @@ -23,6 +21,4 @@ struct space_resv { | |||
| 23 | #define FS_IOC_RESVSP _IOW('X', 40, struct space_resv) | 21 | #define FS_IOC_RESVSP _IOW('X', 40, struct space_resv) |
| 24 | #define FS_IOC_RESVSP64 _IOW('X', 42, struct space_resv) | 22 | #define FS_IOC_RESVSP64 _IOW('X', 42, struct space_resv) |
| 25 | 23 | ||
| 26 | #endif /* __KERNEL__ */ | ||
| 27 | |||
| 28 | #endif /* _FALLOC_H_ */ | 24 | #endif /* _FALLOC_H_ */ |