From: Christian Brauner <christian.brauner@ubuntu.com>
Date: Mon, 24 Jul 2017 14:29:18 +0000 (+0200)
Subject: dir: non-functional changes
X-Git-Tag: lxc-2.1.0~32^2~22
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1eaff7fc4a97d2fb9809b8b6c221700e30325a98;p=thirdparty%2Flxc.git

dir: non-functional changes

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
---

diff --git a/src/lxc/bdev/lxcdir.c b/src/lxc/bdev/lxcdir.c
index 48287dded..2e8e69f1e 100644
--- a/src/lxc/bdev/lxcdir.c
+++ b/src/lxc/bdev/lxcdir.c
@@ -36,14 +36,15 @@ lxc_log_define(lxcdir, lxc);
  * name and paths for the new
  */
 int dir_clonepaths(struct bdev *orig, struct bdev *new, const char *oldname,
-		const char *cname, const char *oldpath, const char *lxcpath,
-		int snap, uint64_t newsize, struct lxc_conf *conf)
+		   const char *cname, const char *oldpath, const char *lxcpath,
+		   int snap, uint64_t newsize, struct lxc_conf *conf)
 {
 	int ret;
 	size_t len;
 
 	if (snap) {
-		ERROR("directories cannot be snapshotted.  Try aufs or overlayfs.");
+		ERROR("directories cannot be snapshotted.  Try aufs or "
+		      "overlayfs.");
 		return -1;
 	}
 
@@ -151,11 +152,13 @@ int dir_mount(struct bdev *bdev)
 
 	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)) {
 		DEBUG("remounting %s on %s with readonly options",
-			src ? src : "(none)", bdev->dest ? bdev->dest : "(none)");
-		mflags = add_required_remount_flags(src, bdev->dest, MS_BIND | MS_REC | mntflags | MS_REMOUNT);
+		      src ? src : "(none)", bdev->dest ? bdev->dest : "(none)");
+		mflags = add_required_remount_flags(
+		    src, bdev->dest, MS_BIND | MS_REC | mntflags | MS_REMOUNT);
 		ret = mount(src, bdev->dest, "bind", mflags, mntdata);
 	}