From 606da782ee98a1db0d0e42c736c566fa46bfe847 Mon Sep 17 00:00:00 2001
From: Al Viro <viro@zeniv.linux.org.uk>
Date: Sun, 24 Jun 2012 10:03:05 +0400
Subject: [PATCH] --- yaml --- r: 312951 b: refs/heads/master c:
 6120d3dbb1220792ebea88cd475e1ec8f8620a93 h: refs/heads/master i:   312949:
 4271a10a177fd0fc763a979cfb58154d0ded4c80   312947:
 2f3bb0d04646821d38b5ca8b266c72e7c3879401   312943:
 7a325329adf2d66156ef37814a39eaab90514a71 v: v3

---
 [refs]                      |  2 +-
 trunk/include/linux/sched.h |  1 -
 trunk/include/net/scm.h     |  1 -
 trunk/net/core/scm.c        | 22 +++-------------------
 4 files changed, 4 insertions(+), 22 deletions(-)

diff --git a/[refs] b/[refs]
index 48a9f282a200..f76ec3fcd7f3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3ffa3c0e3f6e62f67fc2346ca60161dfb030083d
+refs/heads/master: 6120d3dbb1220792ebea88cd475e1ec8f8620a93
diff --git a/trunk/include/linux/sched.h b/trunk/include/linux/sched.h
index af3555cc760f..598ba2da7865 100644
--- a/trunk/include/linux/sched.h
+++ b/trunk/include/linux/sched.h
@@ -1546,7 +1546,6 @@ struct task_struct {
 	unsigned long timer_slack_ns;
 	unsigned long default_timer_slack_ns;
 
-	struct list_head	*scm_work_list;
 #ifdef CONFIG_FUNCTION_GRAPH_TRACER
 	/* Index of current stored address in ret_stack */
 	int curr_ret_stack;
diff --git a/trunk/include/net/scm.h b/trunk/include/net/scm.h
index d456f4c71a32..079d7887dac1 100644
--- a/trunk/include/net/scm.h
+++ b/trunk/include/net/scm.h
@@ -13,7 +13,6 @@
 #define SCM_MAX_FD	253
 
 struct scm_fp_list {
-	struct list_head	list;
 	short			count;
 	short			max;
 	struct file		*fp[SCM_MAX_FD];
diff --git a/trunk/net/core/scm.c b/trunk/net/core/scm.c
index 611c5efd4cb0..8f6ccfd68ef4 100644
--- a/trunk/net/core/scm.c
+++ b/trunk/net/core/scm.c
@@ -109,25 +109,9 @@ void __scm_destroy(struct scm_cookie *scm)
 
 	if (fpl) {
 		scm->fp = NULL;
-		if (current->scm_work_list) {
-			list_add_tail(&fpl->list, current->scm_work_list);
-		} else {
-			LIST_HEAD(work_list);
-
-			current->scm_work_list = &work_list;
-
-			list_add(&fpl->list, &work_list);
-			while (!list_empty(&work_list)) {
-				fpl = list_first_entry(&work_list, struct scm_fp_list, list);
-
-				list_del(&fpl->list);
-				for (i=fpl->count-1; i>=0; i--)
-					fput(fpl->fp[i]);
-				kfree(fpl);
-			}
-
-			current->scm_work_list = NULL;
-		}
+		for (i=fpl->count-1; i>=0; i--)
+			fput(fpl->fp[i]);
+		kfree(fpl);
 	}
 }
 EXPORT_SYMBOL(__scm_destroy);