diff options
| author | Lachlan McIlroy <lachlan@redback.melbourne.sgi.com> | 2008-12-12 15:28:02 +1100 |
|---|---|---|
| committer | Lachlan McIlroy <lachlan@redback.melbourne.sgi.com> | 2008-12-12 15:28:02 +1100 |
| commit | 4d9d4ebf5de848e3450e23e4db9ac74e23e5daa6 (patch) | |
| tree | 2c6d2766054a925a42c1863e91fb5b8c6d0eb5cb /fs/xfs/linux-2.6/xfs_ioctl.h | |
| parent | cfbe52672fbc6f333892e8dde82c35e0a76aa5f5 (diff) | |
| parent | c4cd747ee6c3ba1e7727878e3fce482d0d8c0136 (diff) | |
| download | op-kernel-dev-4d9d4ebf5de848e3450e23e4db9ac74e23e5daa6.zip op-kernel-dev-4d9d4ebf5de848e3450e23e4db9ac74e23e5daa6.tar.gz | |
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 d92131c..8c16bf2 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( __uint32_t flags); extern long -xfs_file_compat_ioctl( - struct file *file, +xfs_file_ioctl( + struct file *filp, unsigned int cmd, - unsigned long arg); + unsigned long p); extern long -xfs_file_compat_invis_ioctl( +xfs_file_compat_ioctl( struct file *file, unsigned int cmd, unsigned long arg); |
