Merge tag 'leds_for_4.12' of git://git.kernel.org/pub/scm/linux/kernel/git/j.anaszews...

[karo-tx-linux.git] / fs / ceph / ioctl.c

diff --git a/fs/ceph/ioctl.c b/fs/ceph/ioctl.c
index 7d752d53353a24e742fff660ab33f2435727f67e..4c9c72f26eb90c6fd3693dc8f6ad7e9eda458ca3 100644 (file)
--- a/fs/ceph/ioctl.c
+++ b/fs/ceph/ioctl.c
@@ -25,7 +25,7 @@ static long ceph_ioctl_get_layout(struct file *file, void __user *arg)
                l.stripe_count = ci->i_layout.stripe_count;
                l.object_size = ci->i_layout.object_size;
                l.data_pool = ci->i_layout.pool_id;
-               l.preferred_osd = (s32)-1;
+               l.preferred_osd = -1;
                if (copy_to_user(arg, &l, sizeof(l)))
                        return -EFAULT;
        }
@@ -97,7 +97,7 @@ static long ceph_ioctl_set_layout(struct file *file, void __user *arg)
                nl.data_pool = ci->i_layout.pool_id;
 
        /* this is obsolete, and always -1 */
-       nl.preferred_osd = le64_to_cpu(-1);
+       nl.preferred_osd = -1;
 
        err = __validate_layout(mdsc, &nl);
        if (err)