diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-15 13:22:10 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-15 13:22:10 -0400 |
| commit | eed631e0d741d1a1067cfc6d709fdf2363126f9c (patch) | |
| tree | 31ba02472a8d5ef2d7780274a7663258c09a9acf /include | |
| parent | bd1a643e10eb8782b36b47c3602300319dd2fb00 (diff) | |
| parent | ebcb904dfe31644857422e3bb62e50f76fe86255 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable
* git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable:
Btrfs: fix FS_IOC_SETFLAGS ioctl
Btrfs: fix FS_IOC_GETFLAGS ioctl
fs: remove FS_COW_FL
Btrfs: fix easily get into ENOSPC in mixed case
Prevent oopsing in posix_acl_valid()
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/fs.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/linux/fs.h b/include/linux/fs.h index dbd860af080..cdf9495df20 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h | |||
| @@ -358,7 +358,6 @@ struct inodes_stat_t { | |||
| 358 | #define FS_EXTENT_FL 0x00080000 /* Extents */ | 358 | #define FS_EXTENT_FL 0x00080000 /* Extents */ |
| 359 | #define FS_DIRECTIO_FL 0x00100000 /* Use direct i/o */ | 359 | #define FS_DIRECTIO_FL 0x00100000 /* Use direct i/o */ |
| 360 | #define FS_NOCOW_FL 0x00800000 /* Do not cow file */ | 360 | #define FS_NOCOW_FL 0x00800000 /* Do not cow file */ |
| 361 | #define FS_COW_FL 0x02000000 /* Cow file */ | ||
| 362 | #define FS_RESERVED_FL 0x80000000 /* reserved for ext2 lib */ | 361 | #define FS_RESERVED_FL 0x80000000 /* reserved for ext2 lib */ |
| 363 | 362 | ||
| 364 | #define FS_FL_USER_VISIBLE 0x0003DFFF /* User visible flags */ | 363 | #define FS_FL_USER_VISIBLE 0x0003DFFF /* User visible flags */ |