[PATCH 1/2] scripts: recordmcount: break hardlinks

Path	csiph.com!news.mixmin.net!aioe.org!bofh.it!news.nic.it!robomod
From	Steven Rostedt <rostedt@goodmis.org>
Newsgroups	linux.kernel
Subject	[PATCH 1/2] scripts: recordmcount: break hardlinks
Date	Wed, 23 Dec 2015 16:30:01 +0100
Message-ID	<qITwt-2TX-9@gated-at.bofh.it> (permalink)
References	<qITwt-2TX-3@gated-at.bofh.it>
X-Original-To	linux-kernel@vger.kernel.org
User-Agent	quilt/0.61-1
MIME-Version	1.0
Content-Type	text/plain; charset=ISO-8859-15
Content-Disposition	inline; filename=0001-scripts-recordmcount-break-hardlinks.patch
Sender	robomod@news.nic.it
List-ID	<linux-kernel.vger.kernel.org>
X-Mailing-List	linux-kernel@vger.kernel.org
Approved	robomod@news.nic.it
Lines	49
Organization	linux.* mail to news gateway
X-Original-Cc	Linus Torvalds <torvalds@linux-foundation.org>, Ingo Molnar <mingo@kernel.org>, Andrew Morton <akpm@linux-foundation.org>, Russell King <rmk+kernel@arm.linux.org.uk>, <stable@vger.kernel.org>
X-Original-Date	Wed, 23 Dec 2015 10:17:04 -0500
X-Original-Message-ID	<20151223152022.160576905@goodmis.org>
X-Original-References	<20151223151703.225805170@goodmis.org>
X-Original-Sender	linux-kernel-owner@vger.kernel.org
Xref	csiph.com linux.kernel:1297508

Show key headers only | View raw

From: Russell King <rmk+kernel@arm.linux.org.uk>

recordmcount edits the file in-place, which can cause problems when
using ccache in hardlink mode.  Arrange for recordmcount to break a
hardlinked object.

Link: http://lkml.kernel.org/r/E1a7MVT-0000et-62@rmk-PC.arm.linux.org.uk

Cc: stable@vger.kernel.org # 2.6.37+
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
---
 scripts/recordmcount.c | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/scripts/recordmcount.c b/scripts/recordmcount.c
index 698768bdc581..91705ef30402 100644
--- a/scripts/recordmcount.c
+++ b/scripts/recordmcount.c
@@ -211,6 +211,20 @@ static void *mmap_file(char const *fname)
 		addr = umalloc(sb.st_size);
 		uread(fd_map, addr, sb.st_size);
 	}
+	if (sb.st_nlink != 1) {
+		/* file is hard-linked, break the hard link */
+		close(fd_map);
+		if (unlink(fname) < 0) {
+			perror(fname);
+			fail_file();
+		}
+		fd_map = open(fname, O_RDWR | O_CREAT, sb.st_mode);
+		if (fd_map < 0) {
+			perror(fname);
+			fail_file();
+		}
+		uwrite(fd_map, addr, sb.st_size);
+	}
 	return addr;
 }
 
-- 
2.6.2


--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Back to linux.kernel | Previous | Next — Previous in thread | Find similar | Unroll thread

Thread

[PATCH 0/2] [GIT PULL] ftrace/recordmcount: Fix hardlink issue with ccache Steven Rostedt <rostedt@goodmis.org> - 2015-12-23 16:30 +0100
  [PATCH 2/2] ftrace/scripts: Have recordmcount copy the object file Steven Rostedt <rostedt@goodmis.org> - 2015-12-23 16:30 +0100
  [PATCH 1/2] scripts: recordmcount: break hardlinks Steven Rostedt <rostedt@goodmis.org> - 2015-12-23 16:30 +0100

csiph-web