diff options
| author | Lachlan McIlroy <lachlan@redback.melbourne.sgi.com> | 2008-12-11 23:28:02 -0500 |
|---|---|---|
| committer | Lachlan McIlroy <lachlan@redback.melbourne.sgi.com> | 2008-12-11 23:28:02 -0500 |
| commit | 4d9d4ebf5de848e3450e23e4db9ac74e23e5daa6 (patch) | |
| tree | 2c6d2766054a925a42c1863e91fb5b8c6d0eb5cb /fs/xfs/linux-2.6/xfs_ioctl.h | |
| parent | cfbe52672fbc6f333892e8dde82c35e0a76aa5f5 (diff) | |
| parent | c4cd747ee6c3ba1e7727878e3fce482d0d8c0136 (diff) | |
Merge branch 'master' of git+ssh://git.melbourne.sgi.com/git/xfs
Diffstat (limited to 'fs/xfs/linux-2.6/xfs_ioctl.h')
| -rw-r--r-- | fs/xfs/linux-2.6/xfs_ioctl.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/fs/xfs/linux-2.6/xfs_ioctl.h b/fs/xfs/linux-2.6/xfs_ioctl.h index d92131c827bc..8c16bf2d7e03 100644 --- a/fs/xfs/linux-2.6/xfs_ioctl.h +++ b/fs/xfs/linux-2.6/xfs_ioctl.h | |||
| @@ -68,13 +68,13 @@ xfs_attrmulti_attr_remove( | |||
| 68 | __uint32_t flags); | 68 | __uint32_t flags); |
| 69 | 69 | ||
| 70 | extern long | 70 | extern long |
| 71 | xfs_file_compat_ioctl( | 71 | xfs_file_ioctl( |
| 72 | struct file *file, | 72 | struct file *filp, |
| 73 | unsigned int cmd, | 73 | unsigned int cmd, |
| 74 | unsigned long arg); | 74 | unsigned long p); |
| 75 | 75 | ||
| 76 | extern long | 76 | extern long |
| 77 | xfs_file_compat_invis_ioctl( | 77 | xfs_file_compat_ioctl( |
| 78 | struct file *file, | 78 | struct file *file, |
| 79 | unsigned int cmd, | 79 | unsigned int cmd, |
| 80 | unsigned long arg); | 80 | unsigned long arg); |