From 68883126bec453d0eae9fd3f298662b50a68e7b7 Mon Sep 17 00:00:00 2001
From: Pavel Emelyanov <xemul@openvz.org>
Date: Fri, 14 Nov 2008 14:51:45 -0800
Subject: [PATCH] --- yaml --- r: 119078 b: refs/heads/master c:
 5421ae0153b4ba0469967cfd8de96144e3bf3979 h: refs/heads/master v: v3

---
 [refs]               | 2 +-
 trunk/net/core/scm.c | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 979d7e1394d6..8ad08ca0ab4c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d8c3e23d06c1020f38b7b6290135a9522a2e3052
+refs/heads/master: 5421ae0153b4ba0469967cfd8de96144e3bf3979
diff --git a/trunk/net/core/scm.c b/trunk/net/core/scm.c
index ab242cc1acca..b12303dd39d9 100644
--- a/trunk/net/core/scm.c
+++ b/trunk/net/core/scm.c
@@ -75,7 +75,6 @@ static int scm_fp_copy(struct cmsghdr *cmsg, struct scm_fp_list **fplp)
 		if (!fpl)
 			return -ENOMEM;
 		*fplp = fpl;
-		INIT_LIST_HEAD(&fpl->list);
 		fpl->count = 0;
 	}
 	fpp = &fpl->fp[fpl->count];
@@ -301,7 +300,6 @@ struct scm_fp_list *scm_fp_dup(struct scm_fp_list *fpl)
 
 	new_fpl = kmalloc(sizeof(*fpl), GFP_KERNEL);
 	if (new_fpl) {
-		INIT_LIST_HEAD(&new_fpl->list);
 		for (i=fpl->count-1; i>=0; i--)
 			get_file(fpl->fp[i]);
 		memcpy(new_fpl, fpl, sizeof(*fpl));