Merge v3.6-rc3 into usb-next

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

diff --git a/fs/ceph/ioctl.c b/fs/ceph/ioctl.c
index 8e3fb69fbe62e60cd3698c07d9fa8e53d6d2b184..1396ceb46797400c124ac80880f31a90583d0e4b 100644 (file)
--- a/fs/ceph/ioctl.c
+++ b/fs/ceph/ioctl.c
@@ -42,7 +42,8 @@ static long __validate_layout(struct ceph_mds_client *mdsc,
        /* validate striping parameters */
        if ((l->object_size & ~PAGE_MASK) ||
            (l->stripe_unit & ~PAGE_MASK) ||
-           ((unsigned)l->object_size % (unsigned)l->stripe_unit))
+           (l->stripe_unit != 0 &&
+            ((unsigned)l->object_size % (unsigned)l->stripe_unit)))
                return -EINVAL;
 
        /* make sure it's a valid data pool */