xfs: make errortag a per-mountpoint structure

[linux-2.6-microblaze.git] / fs / xfs / xfs_ioctl.c

diff --git a/fs/xfs/xfs_ioctl.c b/fs/xfs/xfs_ioctl.c
index 6190697..9c0c7a9 100644 (file)
--- a/fs/xfs/xfs_ioctl.c
+++ b/fs/xfs/xfs_ioctl.c
@@ -120,8 +120,7 @@ xfs_find_handle(
                handle.ha_fid.fid_pad = 0;
                handle.ha_fid.fid_gen = inode->i_generation;
                handle.ha_fid.fid_ino = ip->i_ino;
-
-               hsize = XFS_HSIZE(handle);
+               hsize = sizeof(xfs_handle_t);
        }
 
        error = -EFAULT;
@@ -444,8 +443,8 @@ xfs_attrmulti_attr_get(
        struct inode            *inode,
        unsigned char           *name,
        unsigned char           __user *ubuf,
-       __uint32_t              *len,
-       __uint32_t              flags)
+       uint32_t                *len,
+       uint32_t                flags)
 {
        unsigned char           *kbuf;
        int                     error = -EFAULT;
@@ -473,8 +472,8 @@ xfs_attrmulti_attr_set(
        struct inode            *inode,
        unsigned char           *name,
        const unsigned char     __user *ubuf,
-       __uint32_t              len,
-       __uint32_t              flags)
+       uint32_t                len,
+       uint32_t                flags)
 {
        unsigned char           *kbuf;
        int                     error;
@@ -499,7 +498,7 @@ int
 xfs_attrmulti_attr_remove(
        struct inode            *inode,
        unsigned char           *name,
-       __uint32_t              flags)
+       uint32_t                flags)
 {
        int                     error;
 
@@ -877,7 +876,7 @@ xfs_merge_ioc_xflags(
 
 STATIC unsigned int
 xfs_di2lxflags(
-       __uint16_t      di_flags)
+       uint16_t        di_flags)
 {
        unsigned int    flags = 0;
 
@@ -1288,7 +1287,7 @@ xfs_ioctl_setattr_check_projid(
        struct fsxattr          *fa)
 {
        /* Disallow 32bit project ids if projid32bit feature is not enabled. */
-       if (fa->fsx_projid > (__uint16_t)-1 &&
+       if (fa->fsx_projid > (uint16_t)-1 &&
            !xfs_sb_version_hasprojid32bit(&ip->i_mount->m_sb))
                return -EINVAL;
 
@@ -1932,7 +1931,7 @@ xfs_file_ioctl(
 
        case XFS_IOC_SET_RESBLKS: {
                xfs_fsop_resblks_t inout;
-               __uint64_t         in;
+               uint64_t           in;
 
                if (!capable(CAP_SYS_ADMIN))
                        return -EPERM;
@@ -2018,12 +2017,12 @@ xfs_file_ioctl(
        }
 
        case XFS_IOC_GOINGDOWN: {
-               __uint32_t in;
+               uint32_t in;
 
                if (!capable(CAP_SYS_ADMIN))
                        return -EPERM;
 
-               if (get_user(in, (__uint32_t __user *)arg))
+               if (get_user(in, (uint32_t __user *)arg))
                        return -EFAULT;
 
                return xfs_fs_goingdown(mp, in);
@@ -2038,14 +2037,14 @@ xfs_file_ioctl(
                if (copy_from_user(&in, arg, sizeof(in)))
                        return -EFAULT;
 
-               return xfs_errortag_add(in.errtag, mp);
+               return xfs_errortag_add(mp, in.errtag);
        }
 
        case XFS_IOC_ERROR_CLEARALL:
                if (!capable(CAP_SYS_ADMIN))
                        return -EPERM;
 
-               return xfs_errortag_clearall(mp, 1);
+               return xfs_errortag_clearall(mp);
 
        case XFS_IOC_FREE_EOFBLOCKS: {
                struct xfs_fs_eofblocks eofb;