Btrfs: fix the new inspection ioctls for 32 bit compat

The new ioctls to follow backrefs are not clean for 32/64 bit
compat.  This reworks them for u64s everywhere.  They are brand new, so
there are no problems with changing the interface now.

Signed-off-by: Chris Mason <chris.mason@oracle.com>

diff --git a/fs/btrfs/backref.c b/fs/btrfs/backref.c
index 2351df0de4505adf1f78e52d714f0aa043819186..8855aad3929c337cb1891cd63c702ff1b69e9322 100644 (file)
--- a/fs/btrfs/backref.c
+++ b/fs/btrfs/backref.c
@@ -676,14 +676,14 @@ static int inode_to_path(u64 inum, struct btrfs_inode_ref *iref,
        bytes_left = ipath->fspath->bytes_left > s_ptr ?
                                        ipath->fspath->bytes_left - s_ptr : 0;
 
-       fspath_min = (char *)ipath->fspath->str + (i + 1) * s_ptr;
+       fspath_min = (char *)ipath->fspath->val + (i + 1) * s_ptr;
        fspath = iref_to_path(ipath->fs_root, ipath->btrfs_path, iref, eb,
                                inum, fspath_min, bytes_left);
        if (IS_ERR(fspath))
                return PTR_ERR(fspath);
 
        if (fspath > fspath_min) {
-               ipath->fspath->str[i] = fspath;
+               ipath->fspath->val[i] = (u64)fspath;
                ++ipath->fspath->elem_cnt;
                ipath->fspath->bytes_left = fspath - fspath_min;
        } else {
@@ -698,9 +698,9 @@ static int inode_to_path(u64 inum, struct btrfs_inode_ref *iref,
 /*
  * this dumps all file system paths to the inode into the ipath struct, provided
  * is has been created large enough. each path is zero-terminated and accessed
- * from ipath->fspath->str[i].
+ * from ipath->fspath->val[i].
  * when it returns, there are ipath->fspath->elem_cnt number of paths available
- * in ipath->fspath->str[]. when the allocated space wasn't sufficient, the
+ * in ipath->fspath->val[]. when the allocated space wasn't sufficient, the
  * number of missed paths in recored in ipath->fspath->elem_missed, otherwise,
  * it's zero. ipath->fspath->bytes_missing holds the number of bytes that would
  * have been needed to return all paths.

diff --git a/fs/btrfs/ioctl.c b/fs/btrfs/ioctl.c
index cc98939903417238bb9a0be978bd0c1aef6ff99a..4a34c472f1261bea0c3c228e9800d04a26a6d714 100644 (file)
--- a/fs/btrfs/ioctl.c
+++ b/fs/btrfs/ioctl.c
@@ -2895,7 +2895,7 @@ static long btrfs_ioctl_ino_to_path(struct btrfs_root *root, void __user *arg)
 {
        int ret = 0;
        int i;
-       unsigned long rel_ptr;
+       u64 rel_ptr;
        int size;
        struct btrfs_ioctl_ino_path_args *ipa = NULL;
        struct inode_fs_paths *ipath = NULL;
@@ -2930,11 +2930,11 @@ static long btrfs_ioctl_ino_to_path(struct btrfs_root *root, void __user *arg)
                goto out;
 
        for (i = 0; i < ipath->fspath->elem_cnt; ++i) {
-               rel_ptr = ipath->fspath->str[i] - (char *)ipath->fspath->str;
-               ipath->fspath->str[i] = (void *)rel_ptr;
+               rel_ptr = ipath->fspath->val[i] - (u64)ipath->fspath->val;
+               ipath->fspath->val[i] = rel_ptr;
        }
 
-       ret = copy_to_user(ipa->fspath, ipath->fspath, size);
+       ret = copy_to_user((void *)ipa->fspath, (void *)ipath->fspath, size);
        if (ret) {
                ret = -EFAULT;
                goto out;
@@ -3017,7 +3017,7 @@ static long btrfs_ioctl_logical_to_ino(struct btrfs_root *root,
        if (ret < 0)
                goto out;
 
-       ret = copy_to_user(loi->inodes, inodes, size);
+       ret = copy_to_user((void *)loi->inodes, (void *)inodes, size);
        if (ret)
                ret = -EFAULT;
 

diff --git a/fs/btrfs/ioctl.h b/fs/btrfs/ioctl.h
index 2da30d4950e611c0d0856991b8edca314e7568aa..252ae9915de8fcfa4b6b7a3a502735c28d1819f6 100644 (file)
--- a/fs/btrfs/ioctl.h
+++ b/fs/btrfs/ioctl.h
@@ -198,24 +198,23 @@ struct btrfs_data_container {
        __u32   bytes_missing;  /* out -- additional bytes needed for result */
        __u32   elem_cnt;       /* out */
        __u32   elem_missed;    /* out */
-       union {
-               char    *str[0];        /* out */
-               __u64   val[0];         /* out */
-       };
+       __u64   val[0];         /* out */
 };
 
 struct btrfs_ioctl_ino_path_args {
        __u64                           inum;           /* in */
        __u32                           size;           /* in */
        __u64                           reserved[4];
-       struct btrfs_data_container     *fspath;        /* out */
+       /* struct btrfs_data_container  *fspath;           out */
+       __u64                           fspath;         /* out */
 };
 
 struct btrfs_ioctl_logical_ino_args {
        __u64                           logical;        /* in */
        __u32                           size;           /* in */
        __u64                           reserved[4];
-       struct btrfs_data_container     *inodes;        /* out */
+       /* struct btrfs_data_container  *inodes;        out   */
+       __u64                           inodes;
 };
 
 #define BTRFS_IOC_SNAP_CREATE _IOW(BTRFS_IOCTL_MAGIC, 1, \

diff --git a/fs/btrfs/scrub.c b/fs/btrfs/scrub.c
index 94cd3a19e9c8bf5a903f6c0dfc04c5f4b5b56788..562dad10dee9b894344abe65c5e7c6962d6ae112 100644 (file)
--- a/fs/btrfs/scrub.c
+++ b/fs/btrfs/scrub.c
@@ -272,7 +272,7 @@ static int scrub_print_warning_inode(u64 inum, u64 offset, u64 root, void *ctx)
                        swarn->logical, swarn->dev->name,
                        (unsigned long long)swarn->sector, root, inum, offset,
                        min(isize - offset, (u64)PAGE_SIZE), nlink,
-                       ipath->fspath->str[i]);
+                       (char *)ipath->fspath->val[i]);
 
        free_ipath(ipath);
        return 0;