Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751814Ab3HTVdk (ORCPT ); Tue, 20 Aug 2013 17:33:40 -0400 Received: from mx1.redhat.com ([209.132.183.28]:37305 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751694Ab3HTVdh (ORCPT ); Tue, 20 Aug 2013 17:33:37 -0400 From: Richard Guy Briggs To: linux-audit@redhat.com, linux-kernel@vger.kernel.org, linux-security-module@vger.kernel.org Cc: Richard Guy Briggs , Eric Paris , Al Viro , Ingo Molnar , Peter Zijlstra , "Serge E. Hallyn" , John Johansen , James Morris , Andrew Morton , Oleg Nesterov , Kentaro Takeda , Tetsuo Handa , Greg Kroah-Hartman , Jiri Slaby Subject: [PATCH 09/12] pid: modify task_pid_nr to work without task->pid. Date: Tue, 20 Aug 2013 17:32:01 -0400 Message-Id: <8aa73d2b884439496f87d5f34c12ba9b4b40f7e5.1377032086.git.rgb@redhat.com> In-Reply-To: References: In-Reply-To: References: Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1030 Lines: 31 task->pid is an error prone construct and results in duplicate maintenance. Start it's demise by modifying task_pid_nr to not use it. (informed by ebiederman's 3a2e8c59) Cc: "Eric W. Biederman" Signed-off-by: Richard Guy Briggs --- include/linux/sched.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/linux/sched.h b/include/linux/sched.h index 9651d95..fb09b93 100644 --- a/include/linux/sched.h +++ b/include/linux/sched.h @@ -1473,7 +1473,7 @@ pid_t __task_pid_nr_ns(struct task_struct *task, enum pid_type type, static inline pid_t task_pid_nr(struct task_struct *tsk) { - return tsk->pid; + return pid_nr(task_pid(tsk)); } static inline pid_t task_pid_nr_ns(struct task_struct *tsk, -- 1.7.1 -- 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/