diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-09-05 08:05:11 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-09-05 08:05:11 -0400 |
| commit | 75d8f2931a803b803cb4a850448460475c20f30b (patch) | |
| tree | 9853b9084fa55609c8e4abbc1763bc500e05da50 /fs/ceph/ioctl.c | |
| parent | ffb690d5aa36d38d7bed7579e3f07b84ff6b3a08 (diff) | |
| parent | e93c7d1bc350189511d32cec2f0af79c30e7fa47 (diff) | |
Merge branch 'asoc-omap' into for-3.7
Diffstat (limited to 'fs/ceph/ioctl.c')
| -rw-r--r-- | fs/ceph/ioctl.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/ceph/ioctl.c b/fs/ceph/ioctl.c index 8e3fb69fbe62..1396ceb46797 100644 --- a/fs/ceph/ioctl.c +++ b/fs/ceph/ioctl.c | |||
| @@ -42,7 +42,8 @@ static long __validate_layout(struct ceph_mds_client *mdsc, | |||
| 42 | /* validate striping parameters */ | 42 | /* validate striping parameters */ |
| 43 | if ((l->object_size & ~PAGE_MASK) || | 43 | if ((l->object_size & ~PAGE_MASK) || |
| 44 | (l->stripe_unit & ~PAGE_MASK) || | 44 | (l->stripe_unit & ~PAGE_MASK) || |
| 45 | ((unsigned)l->object_size % (unsigned)l->stripe_unit)) | 45 | (l->stripe_unit != 0 && |
| 46 | ((unsigned)l->object_size % (unsigned)l->stripe_unit))) | ||
| 46 | return -EINVAL; | 47 | return -EINVAL; |
| 47 | 48 | ||
| 48 | /* make sure it's a valid data pool */ | 49 | /* make sure it's a valid data pool */ |