diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2013-07-02 12:01:31 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2013-07-02 12:01:31 -0400 |
| commit | 27eb2c4b3d3e13f376a359e293c212a2e9407af5 (patch) | |
| tree | 556aa7b5cd6eeb4214dec129c789515157187010 /include/uapi/linux/fs.h | |
| parent | 5705b8aca5a80141de5637ff0e23b31b26f2c5bf (diff) | |
| parent | 67bf12ca50d524f9e225347fe63533562e2004de (diff) | |
Merge branch 'next' into for-linus
Prepare first set of updates for 3.11 merge window.
Diffstat (limited to 'include/uapi/linux/fs.h')
| -rw-r--r-- | include/uapi/linux/fs.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/uapi/linux/fs.h b/include/uapi/linux/fs.h index c7fc1e6517c3..a4ed56cf0eac 100644 --- a/include/uapi/linux/fs.h +++ b/include/uapi/linux/fs.h | |||
| @@ -88,7 +88,6 @@ struct inodes_stat_t { | |||
| 88 | #define MS_STRICTATIME (1<<24) /* Always perform atime updates */ | 88 | #define MS_STRICTATIME (1<<24) /* Always perform atime updates */ |
| 89 | 89 | ||
| 90 | /* These sb flags are internal to the kernel */ | 90 | /* These sb flags are internal to the kernel */ |
| 91 | #define MS_SNAP_STABLE (1<<27) /* Snapshot pages during writeback, if needed */ | ||
| 92 | #define MS_NOSEC (1<<28) | 91 | #define MS_NOSEC (1<<28) |
| 93 | #define MS_BORN (1<<29) | 92 | #define MS_BORN (1<<29) |
| 94 | #define MS_ACTIVE (1<<30) | 93 | #define MS_ACTIVE (1<<30) |