perf header: Remove attr_offset from perf_header

Removing attr_offset from perf_header as it's possible to use it as a
local variable.

Signed-off-by: Jiri Olsa <jolsa@redhat.com>
Cc: Andi Kleen <ak@linux.intel.com>
Cc: Corey Ashford <cjashfor@linux.vnet.ibm.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Link: http://lkml.kernel.org/r/1374083403-14591-4-git-send-email-jolsa@redhat.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

diff --git a/tools/perf/util/header.c b/tools/perf/util/header.c
index 035efe7642861eb9c740a1114348faa253582166..dcba56aac1b718b0d0a4bc945d18e62851da9e96 100644 (file)
--- a/tools/perf/util/header.c
+++ b/tools/perf/util/header.c
@@ -2272,6 +2272,7 @@ int perf_session__write_header(struct perf_session *session,
        struct perf_file_attr   f_attr;
        struct perf_header *header = &session->header;
        struct perf_evsel *evsel;
+       u64 attr_offset;
        int err;
 
        lseek(fd, sizeof(f_header), SEEK_SET);
@@ -2285,7 +2286,7 @@ int perf_session__write_header(struct perf_session *session,
                }
        }
 
-       header->attr_offset = lseek(fd, 0, SEEK_CUR);
+       attr_offset = lseek(fd, 0, SEEK_CUR);
 
        list_for_each_entry(evsel, &evlist->entries, node) {
                f_attr = (struct perf_file_attr){
@@ -2315,7 +2316,7 @@ int perf_session__write_header(struct perf_session *session,
                .size      = sizeof(f_header),
                .attr_size = sizeof(f_attr),
                .attrs = {
-                       .offset = header->attr_offset,
+                       .offset = attr_offset,
                        .size   = evlist->nr_entries * sizeof(f_attr),
                },
                .data = {

diff --git a/tools/perf/util/header.h b/tools/perf/util/header.h
index 0bacb2d6eafa7d13d38c75374b9a82c8c93e7131..6fa80f947f71beaf54cf666c4060464965b12e30 100644 (file)
--- a/tools/perf/util/header.h
+++ b/tools/perf/util/header.h
@@ -86,7 +86,6 @@ struct perf_session_env {
 
 struct perf_header {
        bool                    needs_swap;
-       s64                     attr_offset;
        u64                     data_offset;
        u64                     data_size;
        DECLARE_BITMAP(adds_features, HEADER_FEAT_BITS);