Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757555AbZKROyS (ORCPT ); Wed, 18 Nov 2009 09:54:18 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753582AbZKROxu (ORCPT ); Wed, 18 Nov 2009 09:53:50 -0500 Received: from server1.wserver.cz ([82.113.45.157]:51288 "EHLO server1.wserver.cz" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757560AbZKROwA (ORCPT ); Wed, 18 Nov 2009 09:52:00 -0500 From: Jiri Slaby To: jirislaby@gmail.com Cc: mingo@elte.hu, nhorman@tuxdriver.com, sfr@canb.auug.org.au, linux-kernel@vger.kernel.org, akpm@linux-foundation.org, marcin.slusarz@gmail.com, tglx@linutronix.de, mingo@redhat.com, hpa@zytor.com, torvalds@linux-foundation.org, Jiri Slaby , James Morris , Heiko Carstens Subject: [PATCH 12/16] core: rename setrlimit to do_setrlimit Date: Wed, 18 Nov 2009 15:51:58 +0100 Message-Id: <1258555922-2064-12-git-send-email-jslaby@novell.com> X-Mailer: git-send-email 1.6.4.2 In-Reply-To: <4B040A03.2020508@gmail.com> References: <4B040A03.2020508@gmail.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2368 Lines: 71 Rename it so that it makes more sense in the field of syscalls (i.e. do_* is used for functions called by syscall wrappers but also when called from other paths). Signed-off-by: Jiri Slaby Cc: James Morris Cc: Heiko Carstens Cc: Andrew Morton Cc: Ingo Molnar --- fs/proc/base.c | 2 +- include/linux/resource.h | 2 +- kernel/sys.c | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/fs/proc/base.c b/fs/proc/base.c index b894170..c6589fb 100644 --- a/fs/proc/base.c +++ b/fs/proc/base.c @@ -576,7 +576,7 @@ static ssize_t limits_write(struct file *file, const char __user *buf, goto put_task; } - ret = setrlimit(task, i, &new_rlimit); + ret = do_setrlimit(task, i, &new_rlimit); if (ret) count = ret; diff --git a/include/linux/resource.h b/include/linux/resource.h index 4301d67..08beb1a 100644 --- a/include/linux/resource.h +++ b/include/linux/resource.h @@ -71,7 +71,7 @@ struct rlimit { #include int getrusage(struct task_struct *p, int who, struct rusage __user *ru); -int setrlimit(struct task_struct *tsk, unsigned int resource, +int do_setrlimit(struct task_struct *tsk, unsigned int resource, struct rlimit *new_rlim); #endif diff --git a/kernel/sys.c b/kernel/sys.c index 52200d4..4db6ba6 100644 --- a/kernel/sys.c +++ b/kernel/sys.c @@ -1239,7 +1239,7 @@ SYSCALL_DEFINE2(old_getrlimit, unsigned int, resource, #endif /* make sure you are allowed to change @tsk limits before calling this */ -int setrlimit(struct task_struct *tsk, unsigned int resource, +int do_setrlimit(struct task_struct *tsk, unsigned int resource, struct rlimit *new_rlim) { struct rlimit *old_rlim; @@ -1308,7 +1308,7 @@ SYSCALL_DEFINE2(setrlimit, unsigned int, resource, struct rlimit __user *, rlim) return -EINVAL; if (copy_from_user(&new_rlim, rlim, sizeof(*rlim))) return -EFAULT; - return setrlimit(current, resource, &new_rlim); + return do_setrlimit(current, resource, &new_rlim); } /* -- 1.6.4.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/