Unverified Commit 8f2896da by Christian Brauner Committed by Stéphane Graber

dir: non-functional changes

parent 9a534c22
...@@ -36,14 +36,15 @@ lxc_log_define(lxcdir, lxc); ...@@ -36,14 +36,15 @@ lxc_log_define(lxcdir, lxc);
* name and paths for the new * name and paths for the new
*/ */
int dir_clonepaths(struct bdev *orig, struct bdev *new, const char *oldname, int dir_clonepaths(struct bdev *orig, struct bdev *new, const char *oldname,
const char *cname, const char *oldpath, const char *lxcpath, const char *cname, const char *oldpath, const char *lxcpath,
int snap, uint64_t newsize, struct lxc_conf *conf) int snap, uint64_t newsize, struct lxc_conf *conf)
{ {
int ret; int ret;
size_t len; size_t len;
if (snap) { if (snap) {
ERROR("directories cannot be snapshotted. Try aufs or overlayfs."); ERROR("directories cannot be snapshotted. Try aufs or "
"overlayfs.");
return -1; return -1;
} }
...@@ -150,11 +151,13 @@ int dir_mount(struct bdev *bdev) ...@@ -150,11 +151,13 @@ int dir_mount(struct bdev *bdev)
src = lxc_storage_get_path(bdev->src, bdev->type); src = lxc_storage_get_path(bdev->src, bdev->type);
ret = mount(src, bdev->dest, "bind", MS_BIND | MS_REC | mntflags, mntdata); ret = mount(src, bdev->dest, "bind", MS_BIND | MS_REC | mntflags,
mntdata);
if ((0 == ret) && (mntflags & MS_RDONLY)) { if ((0 == ret) && (mntflags & MS_RDONLY)) {
DEBUG("remounting %s on %s with readonly options", DEBUG("remounting %s on %s with readonly options",
src ? src : "(none)", bdev->dest ? bdev->dest : "(none)"); src ? src : "(none)", bdev->dest ? bdev->dest : "(none)");
mflags = add_required_remount_flags(src, bdev->dest, MS_BIND | MS_REC | mntflags | MS_REMOUNT); mflags = add_required_remount_flags(
src, bdev->dest, MS_BIND | MS_REC | mntflags | MS_REMOUNT);
ret = mount(src, bdev->dest, "bind", mflags, mntdata); ret = mount(src, bdev->dest, "bind", mflags, mntdata);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment