Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754953AbbGFI46 (ORCPT ); Mon, 6 Jul 2015 04:56:58 -0400 Received: from mailhub.sw.ru ([195.214.232.25]:46347 "EHLO relay.sw.ru" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754129AbbGFIuk (ORCPT ); Mon, 6 Jul 2015 04:50:40 -0400 From: Andrey Vagin To: linux-kernel@vger.kernel.org Cc: linux-api@vger.kernel.org, Andrey Vagin , Oleg Nesterov , Andrew Morton , Cyrill Gorcunov , Pavel Emelyanov , Roger Luethi , Arnd Bergmann , Arnaldo Carvalho de Melo , David Ahern , Andy Lutomirski , Pavel Odintsov Subject: [PATCH 01/24] kernel: define taststats commands in the one place Date: Mon, 6 Jul 2015 11:47:02 +0300 Message-Id: <1436172445-6979-2-git-send-email-avagin@openvz.org> X-Mailer: git-send-email 2.1.0 In-Reply-To: <1436172445-6979-1-git-send-email-avagin@openvz.org> References: <1436172445-6979-1-git-send-email-avagin@openvz.org> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2126 Lines: 64 Currently if we add a new TASKSTATS_ constant, we will chanage all CGROUPSTATS_ contants and break backward compatibility. Signed-off-by: Andrey Vagin --- include/uapi/linux/cgroupstats.h | 15 --------------- include/uapi/linux/taskstats.h | 7 +++++++ 2 files changed, 7 insertions(+), 15 deletions(-) diff --git a/include/uapi/linux/cgroupstats.h b/include/uapi/linux/cgroupstats.h index 3753c33..8095931 100644 --- a/include/uapi/linux/cgroupstats.h +++ b/include/uapi/linux/cgroupstats.h @@ -37,21 +37,6 @@ struct cgroupstats { __u64 nr_io_wait; /* Number of tasks waiting on IO */ }; -/* - * Commands sent from userspace - * Not versioned. New commands should only be inserted at the enum's end - * prior to __CGROUPSTATS_CMD_MAX - */ - -enum { - CGROUPSTATS_CMD_UNSPEC = __TASKSTATS_CMD_MAX, /* Reserved */ - CGROUPSTATS_CMD_GET, /* user->kernel request/get-response */ - CGROUPSTATS_CMD_NEW, /* kernel->user event */ - __CGROUPSTATS_CMD_MAX, -}; - -#define CGROUPSTATS_CMD_MAX (__CGROUPSTATS_CMD_MAX - 1) - enum { CGROUPSTATS_TYPE_UNSPEC = 0, /* Reserved */ CGROUPSTATS_TYPE_CGROUP_STATS, /* contains name + stats */ diff --git a/include/uapi/linux/taskstats.h b/include/uapi/linux/taskstats.h index 2466e55..a1cc91b 100644 --- a/include/uapi/linux/taskstats.h +++ b/include/uapi/linux/taskstats.h @@ -176,9 +176,16 @@ enum { TASKSTATS_CMD_UNSPEC = 0, /* Reserved */ TASKSTATS_CMD_GET, /* user->kernel request/get-response */ TASKSTATS_CMD_NEW, /* kernel->user event */ + __TASKSTATS_CMD_RESERVED, + + CGROUPSTATS_CMD_GET, /* user->kernel request/get-response */ + CGROUPSTATS_CMD_NEW, /* kernel->user event */ + __TASKSTATS_CMD_MAX, }; +#define __CGROUPSTATS_CMD_MAX __TASKSTATS_CMD_MAX +#define CGROUPSTATS_CMD_MAX (__CGROUPSTATS_CMD_MAX - 1) #define TASKSTATS_CMD_MAX (__TASKSTATS_CMD_MAX - 1) enum { -- 2.1.0 -- 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/