diff --git a/src/libos/src/fs/file_ops/fcntl.rs b/src/libos/src/fs/file_ops/fcntl.rs index 1395b0d0..b1c98447 100644 --- a/src/libos/src/fs/file_ops/fcntl.rs +++ b/src/libos/src/fs/file_ops/fcntl.rs @@ -1,4 +1,4 @@ -use super::flock::c_flock; +use super::locks::range_lock::c_flock; use super::*; use util::mem_util::from_user; diff --git a/src/libos/src/fs/locks/mod.rs b/src/libos/src/fs/locks/mod.rs new file mode 100644 index 00000000..48b15154 --- /dev/null +++ b/src/libos/src/fs/locks/mod.rs @@ -0,0 +1,3 @@ +use super::*; + +pub mod range_lock; diff --git a/src/libos/src/fs/flock/builder.rs b/src/libos/src/fs/locks/range_lock/builder.rs similarity index 100% rename from src/libos/src/fs/flock/builder.rs rename to src/libos/src/fs/locks/range_lock/builder.rs diff --git a/src/libos/src/fs/flock/mod.rs b/src/libos/src/fs/locks/range_lock/mod.rs similarity index 100% rename from src/libos/src/fs/flock/mod.rs rename to src/libos/src/fs/locks/range_lock/mod.rs diff --git a/src/libos/src/fs/flock/range.rs b/src/libos/src/fs/locks/range_lock/range.rs similarity index 100% rename from src/libos/src/fs/flock/range.rs rename to src/libos/src/fs/locks/range_lock/range.rs diff --git a/src/libos/src/fs/mod.rs b/src/libos/src/fs/mod.rs index 4ff2f74e..43ce9533 100644 --- a/src/libos/src/fs/mod.rs +++ b/src/libos/src/fs/mod.rs @@ -23,7 +23,7 @@ pub use self::file_ops::{ IfConf, IoctlCmd, Stat, StatusFlags, StructuredIoctlArgType, StructuredIoctlNum, }; pub use self::file_table::{FileDesc, FileTable, FileTableEvent, FileTableNotifier}; -pub use self::flock::{ +pub use self::locks::range_lock::{ FileRange, RangeLock, RangeLockBuilder, RangeLockList, RangeLockType, OFFSET_MAX, }; pub use self::fs_ops::Statfs; @@ -43,7 +43,7 @@ mod events; mod file; mod file_ops; mod file_table; -mod flock; +mod locks; mod fs_ops; mod fs_view; mod host_fd;