github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-06-25 15:02:45 +00:00
Code Issues Projects Releases Wiki Activity

agent: remove unused field in mount handling

Browse Source 
In our parsing of mountinfo, majority of the fields are unused.
Let's stop saving these.

Fixes: #3180

Signed-off-by: Eric Ernst <eric_ernst@apple.com>
This commit is contained in:
Eric Ernst 2021-12-02 16:22:51 -08:00
parent f6ae15826e
commit 7cb7b9d5ba
2 changed files with 16 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/agent/rustjail/src/mount.rs
View File

@ -34,17 +34,9 @@ use crate::log_child;
// struct is populated from the content in the /proc/<pid>/mountinfo file. // struct is populated from the content in the /proc/<pid>/mountinfo file.
#[derive(std::fmt::Debug)] #[derive(std::fmt::Debug)]
pub struct Info { pub struct Info {
id: i32,
parent: i32,
major: i32,
minor: i32,
root: String,
mount_point: String, mount_point: String,
opts: String,
optional: String, optional: String,
fstype: String, fstype: String,
source: String,
vfs_opts: String,
} }
const MOUNTINFOFORMAT: &str = "{d} {d} {d}:{d} {} {} {} {}"; const MOUNTINFOFORMAT: &str = "{d} {d} {d}:{d} {} {} {} {}";
@ -562,7 +554,20 @@ fn parse_mount_table() -> Result<Vec<Info>> {
for (_index, line) in reader.lines().enumerate() { for (_index, line) in reader.lines().enumerate() {
let line = line?; let line = line?;
let (id, parent, major, minor, root, mount_point, opts, optional) = scan_fmt!( //Example mountinfo format:
// id
// | / parent
// | | / major:minor
// | | | / root
// | | | | / mount_point
// | | | | | / opts
// | | | | | | / optional
// | | | | | | | / fstype
// | | | | | | | | / source
// | | | | | | | | | / vfs_opts
// 22 96 0:21 / /sys rw,nosuid,nodev,noexec,relatime shared:2 - sysfs sysfs rw,seclabel
let (_id, _parent, _major, _minor, _root, mount_point, _opts, optional) = scan_fmt!(
&line, &line,
MOUNTINFOFORMAT, MOUNTINFOFORMAT,
i32, i32,
@ -577,7 +582,7 @@ fn parse_mount_table() -> Result<Vec<Info>> {
let fields: Vec<&str> = line.split(" - ").collect(); let fields: Vec<&str> = line.split(" - ").collect();
if fields.len() == 2 { if fields.len() == 2 {
let (fstype, source, vfs_opts) = let (fstype, _source, _vfs_opts) =
scan_fmt!(fields[1], "{} {} {}", String, String, String)?; scan_fmt!(fields[1], "{} {} {}", String, String, String)?;
let mut optional_new = String::new(); let mut optional_new = String::new();
@ -586,17 +591,9 @@ fn parse_mount_table() -> Result<Vec<Info>> {
} }
let info = Info { let info = Info {
id,
parent,
major,
minor,
root,
mount_point, mount_point,
opts,
optional: optional_new, optional: optional_new,
fstype, fstype,
source,
vfs_opts,
}; };
infos.push(info); infos.push(info);

4
src/agent/src/network.rs
View File

@ -20,9 +20,7 @@ pub struct Network {
impl Network { impl Network {
pub fn new() -> Network { pub fn new() -> Network {
Network { Network { dns: Vec::new() }
dns: Vec::new(),
}
} }
pub fn set_dns(&mut self, dns: String) { pub fn set_dns(&mut self, dns: String) {