Author: root <r...@matthias-desktop.(none)> Date: Mon Mar 15 12:45:09 2010 -0400
vg.ml was rid of warnings. Signed-off-by: Matthias Goergens <[email protected]> mlvm/vg.ml | 30 ++++++++++++++++-------------- 1 files changed, 16 insertions(+), 14 deletions(-)
# HG changeset patch # User Matthias Goergens <[email protected]> # Date 1272293888 -3600 # Node ID 92d3fcf13024f0764ecbaa0f5b9fc7ee2002d8b5 # Parent 8f265581beef41cbd70fe4032a46867e3b9c4d9a commit a94b25bb3d767cc879fdbb4aec044911f7c12470 Author: root <r...@matthias-desktop.(none)> Date: Mon Mar 15 12:45:09 2010 -0400 vg.ml was rid of warnings. Signed-off-by: Matthias Goergens <[email protected]> diff -r 8f265581beef -r 92d3fcf13024 mlvm/vg.ml --- a/mlvm/vg.ml +++ b/mlvm/vg.ml @@ -257,7 +257,7 @@ (* let size = Int64.mul Constants.extent_size (Lv.size_in_extents lv) in if !Constants.full_provision then ignore(Unix.LargeFile.lseek fd (Int64.sub size 1L) Unix.SEEK_SET);*) - Unix.write fd "\000" 0 1; + ignore(Unix.write fd "\000" 0 1); Unix.close fd; end; (* Let's also make sure that the dir exists for the dev node! *) @@ -280,8 +280,8 @@ let lv_deactivate vg lv = let dm_name = dm_name_of vg lv in - let nod = dev_path_of_dm_name dm_name in - lv_deactivate_internal None dm_name + (ignore (dev_path_of_dm_name dm_name); + lv_deactivate_internal None dm_name) let lv_change_internal dm_name dm_map dereference_table = Camldm.reload dm_name dm_map dereference_table; @@ -309,16 +309,18 @@ find 0 sector_num let with_open_redo vg f = - let Some lv_name = vg.redo_lv in - let lv = List.find (fun lv -> lv.Lv.name=lv_name) vg.lvs in - let dev = (List.hd vg.pvs).Pv.dev in - let (dev,pos) = - if !Constants.dummy_mode then - (Printf.sprintf "%s/%s/redo" !Constants.dummy_base dev,0L) - else - get_absolute_pos_of_sector vg lv 0L in - let fd = Unix.openfile dev [Unix.O_RDWR; Unix.O_CREAT] 0o644 in - Pervasiveext.finally (fun () -> f (fd,pos)) (fun () -> Unix.close fd) + match vg.redo_lv with + | Some lv_name -> + let lv = List.find (fun lv -> lv.Lv.name=lv_name) vg.lvs in + let dev = (List.hd vg.pvs).Pv.dev in + let (dev,pos) = + if !Constants.dummy_mode then + (Printf.sprintf "%s/%s/redo" !Constants.dummy_base dev,0L) + else + get_absolute_pos_of_sector vg lv 0L in + let fd = Unix.openfile dev [Unix.O_RDWR; Unix.O_CREAT] 0o644 in + Pervasiveext.finally (fun () -> f (fd,pos)) (fun () -> Unix.close fd) + | None -> failwith "vg.ml/with_open_redo: vg.redo_lv == None, but should not be." let read_redo vg = with_open_redo vg (fun (fd,pos) -> @@ -444,7 +446,7 @@ ops=[]; } in - write vg true; + ignore (write vg true); debug "VG created" let parse text pvdatas =
_______________________________________________ xen-api mailing list [email protected] http://lists.xensource.com/mailman/listinfo/xen-api
