From: Stéphane Graber <stgraber@stgraber.org>
Date: Fri, 21 Sep 2018 13:13:16 +0000 (+0200)
Subject: Merge pull request #2633 from brauner/2018-09-21/cgfsng_ops_attribute
X-Git-Tag: lxc-3.1.0~101
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ef92a78a1f65af618920a2fae1f4d582cd3e09b5;p=thirdparty%2Flxc.git

Merge pull request #2633 from brauner/2018-09-21/cgfsng_ops_attribute

cgfsng: mark ops with __cgfsng_ops__ attribute
---

ef92a78a1f65af618920a2fae1f4d582cd3e09b5
diff --cc src/lxc/cgroups/cgfsng.c
index 40517c22d,761dc2b11..bd72b38b2
--- a/src/lxc/cgroups/cgfsng.c
+++ b/src/lxc/cgroups/cgfsng.c
@@@ -2546,10 -2554,10 +2554,10 @@@ static bool cg_init(struct cgroup_ops *
  	if (ret == CGROUP2_SUPER_MAGIC)
  		return true;
  
 -	return cg_hybrid_init(ops, keep);
 +	return cg_hybrid_init(ops, relative);
  }
  
- static bool cgfsng_data_init(struct cgroup_ops *ops)
+ __cgfsng_ops__ static bool cgfsng_data_init(struct cgroup_ops *ops)
  {
  	const char *cgroup_pattern;