diff options
| author | Sage Weil <sage@inktank.com> | 2012-05-14 21:34:38 +0200 |
|---|---|---|
| committer | Alex Elder <elder@dreamhost.com> | 2012-05-16 21:28:27 +0200 |
| commit | 702aeb1f88e707241d76e1e2a1a02dd81e6c2d77 (patch) | |
| tree | 1d605a2109700d5ba4cc6c95f253e6ee3e10a120 /fs/ceph/ioctl.c | |
| parent | ceph: messenger: change read_partial() to take "end" arg (diff) | |
| download | linux-702aeb1f88e707241d76e1e2a1a02dd81e6c2d77.tar.xz linux-702aeb1f88e707241d76e1e2a1a02dd81e6c2d77.zip | |
ceph: fully initialize new layout
When we are setting a new layout, fully initialize the structure:
- zero it out
- always set preferred_osd to -1
Signed-off-by: Sage Weil <sage@inktank.com>
Reviewed-by: Alex Elder <elder@inktank.com>
Diffstat (limited to 'fs/ceph/ioctl.c')
| -rw-r--r-- | fs/ceph/ioctl.c | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/fs/ceph/ioctl.c b/fs/ceph/ioctl.c index 0e2f021109ee..c0b7314b90f9 100644 --- a/fs/ceph/ioctl.c +++ b/fs/ceph/ioctl.c @@ -80,22 +80,29 @@ static long ceph_ioctl_set_layout(struct file *file, void __user *arg) /* validate changed params against current layout */ err = ceph_do_getattr(file->f_dentry->d_inode, CEPH_STAT_CAP_LAYOUT); - if (!err) { - nl.stripe_unit = ceph_file_layout_su(ci->i_layout); - nl.stripe_count = ceph_file_layout_stripe_count(ci->i_layout); - nl.object_size = ceph_file_layout_object_size(ci->i_layout); - nl.data_pool = le32_to_cpu(ci->i_layout.fl_pg_pool); - } else + if (err) return err; + memset(&nl, 0, sizeof(nl)); if (l.stripe_count) nl.stripe_count = l.stripe_count; + else + nl.stripe_count = ceph_file_layout_stripe_count(ci->i_layout); if (l.stripe_unit) nl.stripe_unit = l.stripe_unit; + else + nl.stripe_unit = ceph_file_layout_su(ci->i_layout); if (l.object_size) nl.object_size = l.object_size; + else + nl.object_size = ceph_file_layout_object_size(ci->i_layout); if (l.data_pool) nl.data_pool = l.data_pool; + else + nl.data_pool = ceph_file_layout_pg_pool(ci->i_layout); + + /* this is obsolete, and always -1 */ + nl.preferred_osd = le64_to_cpu(-1); err = __validate_layout(mdsc, &nl); if (err) |