diff --git a/[refs] b/[refs] index 91efcf23c0e1..1f17fa253121 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 31d8b5631f095cb7100cfccc95c801a2547ffe2b +refs/heads/master: 5cf8cf4146de03de67d1a8aefbece66b65f255cc diff --git a/trunk/fs/compat_ioctl.c b/trunk/fs/compat_ioctl.c index 39bd4d38e889..45e59d3c7f1f 100644 --- a/trunk/fs/compat_ioctl.c +++ b/trunk/fs/compat_ioctl.c @@ -1913,6 +1913,9 @@ COMPATIBLE_IOCTL(FIONREAD) /* This is also TIOCINQ */ /* 0x00 */ COMPATIBLE_IOCTL(FIBMAP) COMPATIBLE_IOCTL(FIGETBSZ) +/* 'X' - originally XFS but some now in the VFS */ +COMPATIBLE_IOCTL(FIFREEZE) +COMPATIBLE_IOCTL(FITHAW) /* RAID */ COMPATIBLE_IOCTL(RAID_VERSION) COMPATIBLE_IOCTL(GET_ARRAY_INFO)