diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-14 13:03:36 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-14 13:03:36 -0500 |
commit | 37222e1c9ee3ce587f5b41fed868bd8a592a992f (patch) | |
tree | b65f22a1e20286185463ca1a2889e593d963a393 /fs | |
parent | 76b8f82cde2d9c13ef0c9a9aa2581b9b30b68e8c (diff) | |
parent | 06e3c817b750c131a20e82eed57a17841ea88ed2 (diff) |
Merge branch 'for-linus' of git://neil.brown.name/md
* 'for-linus' of git://neil.brown.name/md: (27 commits)
md: add 'recovery_start' per-device sysfs attribute
md: rcu_read_lock() walk of mddev->disks in md_do_sync()
md: integrate spares into array at earliest opportunity.
md: move compat_ioctl handling into md.c
md: revise Kconfig help for MD_MULTIPATH
md: add MODULE_DESCRIPTION for all md related modules.
raid: improve MD/raid10 handling of correctable read errors.
md/raid10: print more useful messages on device failure.
md/bitmap: update dirty flag when bitmap bits are explicitly set.
md: Support write-intent bitmaps with externally managed metadata.
md/bitmap: move setting of daemon_lastrun out of bitmap_read_sb
md: support updating bitmap parameters via sysfs.
md: factor out parsing of fixed-point numbers
md: support bitmap offset appropriate for external-metadata arrays.
md: remove needless setting of thread->timeout in raid10_quiesce
md: change daemon_sleep to be in 'jiffies' rather than 'seconds'.
md: move offset, daemon_sleep and chunksize out of bitmap structure
md: collect bitmap-specific fields into one structure.
md/raid1: add takeover support for raid5->raid1
md: add honouring of suspend_{lo,hi} to raid1.
...
Diffstat (limited to 'fs')
-rw-r--r-- | fs/compat_ioctl.c | 18 |
1 files changed, 0 insertions, 18 deletions
diff --git a/fs/compat_ioctl.c b/fs/compat_ioctl.c index 278020d2449c..14cbc831422a 100644 --- a/fs/compat_ioctl.c +++ b/fs/compat_ioctl.c | |||
@@ -979,24 +979,6 @@ COMPATIBLE_IOCTL(FIGETBSZ) | |||
979 | /* 'X' - originally XFS but some now in the VFS */ | 979 | /* 'X' - originally XFS but some now in the VFS */ |
980 | COMPATIBLE_IOCTL(FIFREEZE) | 980 | COMPATIBLE_IOCTL(FIFREEZE) |
981 | COMPATIBLE_IOCTL(FITHAW) | 981 | COMPATIBLE_IOCTL(FITHAW) |
982 | /* RAID */ | ||
983 | COMPATIBLE_IOCTL(RAID_VERSION) | ||
984 | COMPATIBLE_IOCTL(GET_ARRAY_INFO) | ||
985 | COMPATIBLE_IOCTL(GET_DISK_INFO) | ||
986 | COMPATIBLE_IOCTL(PRINT_RAID_DEBUG) | ||
987 | COMPATIBLE_IOCTL(RAID_AUTORUN) | ||
988 | COMPATIBLE_IOCTL(CLEAR_ARRAY) | ||
989 | COMPATIBLE_IOCTL(ADD_NEW_DISK) | ||
990 | COMPATIBLE_IOCTL(SET_ARRAY_INFO) | ||
991 | COMPATIBLE_IOCTL(SET_DISK_INFO) | ||
992 | COMPATIBLE_IOCTL(WRITE_RAID_INFO) | ||
993 | COMPATIBLE_IOCTL(UNPROTECT_ARRAY) | ||
994 | COMPATIBLE_IOCTL(PROTECT_ARRAY) | ||
995 | COMPATIBLE_IOCTL(RUN_ARRAY) | ||
996 | COMPATIBLE_IOCTL(STOP_ARRAY) | ||
997 | COMPATIBLE_IOCTL(STOP_ARRAY_RO) | ||
998 | COMPATIBLE_IOCTL(RESTART_ARRAY_RW) | ||
999 | COMPATIBLE_IOCTL(GET_BITMAP_FILE) | ||
1000 | COMPATIBLE_IOCTL(KDGETKEYCODE) | 982 | COMPATIBLE_IOCTL(KDGETKEYCODE) |
1001 | COMPATIBLE_IOCTL(KDSETKEYCODE) | 983 | COMPATIBLE_IOCTL(KDSETKEYCODE) |
1002 | COMPATIBLE_IOCTL(KDGKBTYPE) | 984 | COMPATIBLE_IOCTL(KDGKBTYPE) |