Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Pass Vec<Segment> as &[Segment] #171

Merged
merged 1 commit into from
Sep 21, 2017
Merged

Pass Vec<Segment> as &[Segment] #171

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
45 changes: 20 additions & 25 deletions src/lineardev.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,13 +70,13 @@ impl LinearDev {
/// the existence of the requested device". Of course, a linear device
/// is usually expected to hold data, so it is important to get the
/// mapping just right.
pub fn setup(name: &DmName, dm: &DM, segments: Vec<Segment>) -> DmResult<LinearDev> {
pub fn setup(name: &DmName, dm: &DM, segments: &[Segment]) -> DmResult<LinearDev> {
if segments.is_empty() {
return Err(DmError::Dm(ErrorEnum::Invalid,
"linear device must have at least one segment".into()));
}

let table = LinearDev::dm_table(&segments);
let table = LinearDev::dm_table(segments);
let dev_info = if device_exists(dm, name)? {
let id = DevId::Name(name);
if dm.table_status(&id, DM_STATUS_TABLE)?.1 != table {
Expand All @@ -91,7 +91,7 @@ impl LinearDev {
DM::wait_for_dm();
Ok(LinearDev {
dev_info: dev_info,
segments: segments,
segments: segments.to_vec(),
})
}

Expand Down Expand Up @@ -132,7 +132,7 @@ impl LinearDev {
/// segments already in the device, this method will succeed. However,
/// the behavior of the linear device in that case should be treated as
/// undefined.
pub fn extend(&mut self, dm: &DM, new_segs: Vec<Segment>) -> DmResult<()> {
pub fn extend(&mut self, dm: &DM, new_segs: &[Segment]) -> DmResult<()> {
if new_segs.is_empty() {
return Ok(());
}
Expand All @@ -154,9 +154,9 @@ impl LinearDev {
};

if coalesced_new_first {
self.segments.extend(new_segs.into_iter().skip(1));
self.segments.extend(new_segs.iter().skip(1).cloned());
} else {
self.segments.extend(new_segs);
self.segments.extend(new_segs.iter().cloned());
}

let table = LinearDev::dm_table(&self.segments);
Expand Down Expand Up @@ -189,7 +189,7 @@ mod tests {
fn test_empty(_paths: &[&Path]) -> () {
assert!(LinearDev::setup(DmName::new("new").expect("valid format"),
&DM::new().unwrap(),
vec![])
&[])
.is_err());
}

Expand All @@ -202,7 +202,7 @@ mod tests {
let dev = Device::from(devnode_to_devno(&paths[0]).unwrap());
let mut ld = LinearDev::setup(DmName::new(name).expect("valid format"),
&dm,
vec![Segment::new(dev, Sectors(0), Sectors(1))])
&[Segment::new(dev, Sectors(0), Sectors(1))])
.unwrap();

ld.set_name(&dm, DmName::new(name).expect("valid format"))
Expand All @@ -221,7 +221,7 @@ mod tests {
let dev = Device::from(devnode_to_devno(&paths[0]).unwrap());
let mut ld = LinearDev::setup(DmName::new(name).expect("valid format"),
&dm,
vec![Segment::new(dev, Sectors(0), Sectors(1))])
&[Segment::new(dev, Sectors(0), Sectors(1))])
.unwrap();

let new_name = "new_name";
Expand All @@ -241,8 +241,8 @@ mod tests {
let dm = DM::new().unwrap();
let name = "name";
let dev = Device::from(devnode_to_devno(&paths[0]).unwrap());
let segments = vec![Segment::new(dev, Sectors(0), Sectors(1)),
Segment::new(dev, Sectors(0), Sectors(1))];
let segments = &[Segment::new(dev, Sectors(0), Sectors(1)),
Segment::new(dev, Sectors(0), Sectors(1))];
let range: Sectors = segments.iter().map(|s| s.length).sum();
let count = segments.len();
let ld = LinearDev::setup(DmName::new(name).expect("valid format"), &dm, segments).unwrap();
Expand Down Expand Up @@ -270,15 +270,12 @@ mod tests {
let dm = DM::new().unwrap();
let name = "name";
let dev = Device::from(devnode_to_devno(&paths[0]).unwrap());
let segments = vec![Segment::new(dev, Sectors(0), Sectors(1))];
let table = LinearDev::dm_table(&segments);
let ld = LinearDev::setup(DmName::new(name).expect("valid format"),
&dm,
segments.iter().cloned().collect())
.unwrap();
let segments = &[Segment::new(dev, Sectors(0), Sectors(1))];
let table = LinearDev::dm_table(segments);
let ld = LinearDev::setup(DmName::new(name).expect("valid format"), &dm, segments).unwrap();
assert!(LinearDev::setup(DmName::new(name).expect("valid format"),
&dm,
vec![Segment::new(dev, Sectors(1), Sectors(1))])
&[Segment::new(dev, Sectors(1), Sectors(1))])
.is_err());
assert!(LinearDev::setup(DmName::new(name).expect("valid format"), &dm, segments).is_ok());
assert_eq!(table,
Expand All @@ -296,11 +293,9 @@ mod tests {

let dm = DM::new().unwrap();
let dev = Device::from(devnode_to_devno(&paths[0]).unwrap());
let segments = vec![Segment::new(dev, Sectors(0), Sectors(1))];
let ld = LinearDev::setup(DmName::new("name").expect("valid format"),
&dm,
segments.iter().cloned().collect())
.unwrap();
let segments = &[Segment::new(dev, Sectors(0), Sectors(1))];
let ld = LinearDev::setup(DmName::new("name").expect("valid format"), &dm, segments)
.unwrap();
let ld2 = LinearDev::setup(DmName::new("ersatz").expect("valid format"), &dm, segments);
assert!(ld2.is_ok());

Expand All @@ -315,8 +310,8 @@ mod tests {
let dm = DM::new().unwrap();
let name = "name";
let dev = Device::from(devnode_to_devno(&paths[0]).unwrap());
let segments = vec![Segment::new(dev, Sectors(0), Sectors(1))];
let table = LinearDev::dm_table(&segments);
let segments = &[Segment::new(dev, Sectors(0), Sectors(1))];
let table = LinearDev::dm_table(segments);
let ld = LinearDev::setup(DmName::new(name).expect("valid format"), &dm, segments).unwrap();
assert_eq!(table,
dm.table_status(&DevId::Name(DmName::new(name).expect("valid format")),
Expand Down
17 changes: 8 additions & 9 deletions src/thinpooldev.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -271,7 +271,7 @@ impl ThinPoolDev {
}

/// Extend an existing meta device with additional new segments.
pub fn extend_meta(&mut self, dm: &DM, new_segs: Vec<Segment>) -> DmResult<()> {
pub fn extend_meta(&mut self, dm: &DM, new_segs: &[Segment]) -> DmResult<()> {
self.meta_dev.extend(dm, new_segs)?;
table_reload(dm,
&DevId::Name(self.name()),
Expand All @@ -284,7 +284,7 @@ impl ThinPoolDev {
}

/// Extend an existing data device with additional new segments.
pub fn extend_data(&mut self, dm: &DM, new_segs: Vec<Segment>) -> DmResult<()> {
pub fn extend_data(&mut self, dm: &DM, new_segs: &[Segment]) -> DmResult<()> {
self.data_dev.extend(dm, new_segs)?;
table_reload(dm,
&DevId::Name(self.name()),
Expand All @@ -302,15 +302,14 @@ pub fn minimal_thinpool(dm: &DM, path: &Path) -> ThinPoolDev {
let dev = Device::from(devnode_to_devno(path).unwrap());
let meta = LinearDev::setup(DmName::new("meta").expect("valid format"),
dm,
vec![Segment::new(dev, Sectors(0), MIN_RECOMMENDED_METADATA_SIZE)])
&[Segment::new(dev, Sectors(0), MIN_RECOMMENDED_METADATA_SIZE)])
.unwrap();

let data = LinearDev::setup(DmName::new("data").expect("valid format"),
dm,
vec![Segment::new(dev,
MIN_RECOMMENDED_METADATA_SIZE,
MIN_DATA_BLOCK_SIZE)])
.unwrap();
let data =
LinearDev::setup(DmName::new("data").expect("valid format"),
dm,
&[Segment::new(dev, MIN_RECOMMENDED_METADATA_SIZE, MIN_DATA_BLOCK_SIZE)])
.unwrap();

ThinPoolDev::new(DmName::new("pool").expect("valid format"),
dm,
Expand Down