From 2affed068da7be1f88dc99f8c17aa5fde89ad7de Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Tue, 21 Aug 2012 12:11:51 -0700 Subject: [PATCH] --- yaml --- r: 322118 b: refs/heads/master c: 45f2e081f573526977abfa781a12728f83e9641f h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/fs/ceph/ioctl.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 046407d0afb6..9abda953608f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6d4221b53707486dfad3f5bfe568d2ce7f4c9863 +refs/heads/master: 45f2e081f573526977abfa781a12728f83e9641f diff --git a/trunk/fs/ceph/ioctl.c b/trunk/fs/ceph/ioctl.c index 8e3fb69fbe62..1396ceb46797 100644 --- a/trunk/fs/ceph/ioctl.c +++ b/trunk/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 */