From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Mon, 5 Aug 2013 05:44:44 +0000 (+0800)
Subject: forgot a 'quilt refresh'
X-Git-Tag: v3.0.90~18
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=efcfa87f773c03ec4127276c9c2d91ea2338767d;p=thirdparty%2Fkernel%2Fstable-queue.git

forgot a 'quilt refresh'
---

diff --git a/queue-3.10/cgroup-fix-umount-vs-cgroup_cfts_commit-race.patch b/queue-3.10/cgroup-fix-umount-vs-cgroup_cfts_commit-race.patch
index a90c18ff65a..3bfee354a72 100644
--- a/queue-3.10/cgroup-fix-umount-vs-cgroup_cfts_commit-race.patch
+++ b/queue-3.10/cgroup-fix-umount-vs-cgroup_cfts_commit-race.patch
@@ -44,7 +44,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  	/* %NULL @cfts indicates abort and don't bother if @ss isn't attached */
 -	if (cfts && ss->root != &rootnode) {
 +	if (cfts && ss->root != &rootnode &&
-+	    atomic_inc_not_zero(sb->s_active)) {
++	    atomic_inc_not_zero(&sb->s_active)) {
  		list_for_each_entry(cgrp, &ss->root->allcg_list, allcg_node) {
  			dget(cgrp->dentry);
  			list_add_tail(&cgrp->cft_q_node, &pending);