From patchwork Wed Jun 23 10:03:15 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Munsie X-Patchwork-Id: 56660 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from bilbo.ozlabs.org (localhost [127.0.0.1]) by ozlabs.org (Postfix) with ESMTP id CEE43105068 for ; Wed, 23 Jun 2010 20:17:44 +1000 (EST) Received: by ozlabs.org (Postfix) id C1052B741B; Wed, 23 Jun 2010 20:04:41 +1000 (EST) Delivered-To: linuxppc-dev@ozlabs.org Received: from e23smtp03.au.ibm.com (e23smtp03.au.ibm.com [202.81.31.145]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client CN "e23smtp03.au.ibm.com", Issuer "Equifax" (verified OK)) by ozlabs.org (Postfix) with ESMTPS id B2B09B7378 for ; Wed, 23 Jun 2010 20:04:41 +1000 (EST) Received: from d23relay04.au.ibm.com (d23relay04.au.ibm.com [202.81.31.246]) by e23smtp03.au.ibm.com (8.14.4/8.13.1) with ESMTP id o5NA192D021365 for ; Wed, 23 Jun 2010 20:01:09 +1000 Received: from d23av02.au.ibm.com (d23av02.au.ibm.com [9.190.235.138]) by d23relay04.au.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id o5NA4eqg1323214 for ; Wed, 23 Jun 2010 20:04:40 +1000 Received: from d23av02.au.ibm.com (loopback [127.0.0.1]) by d23av02.au.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id o5NA4dSm005610 for ; Wed, 23 Jun 2010 20:04:40 +1000 Received: from ozlabs.au.ibm.com (ozlabs.au.ibm.com [9.190.163.12]) by d23av02.au.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id o5NA4c7s005587; Wed, 23 Jun 2010 20:04:38 +1000 Received: from delenn.ozlabs.ibm.com (haven.au.ibm.com [9.190.164.82]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.au.ibm.com (Postfix) with ESMTP id 825987375E; Wed, 23 Jun 2010 20:04:38 +1000 (EST) From: "Ian Munsie" To: linux-kernel@vger.kernel.org, linuxppc-dev@ozlabs.org Subject: [PATCH 34/40] trace syscalls: Convert generic syscalls without long return type Date: Wed, 23 Jun 2010 20:03:15 +1000 Message-Id: <1277287401-28571-35-git-send-email-imunsie@au1.ibm.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1277287401-28571-1-git-send-email-imunsie@au1.ibm.com> References: <1277287401-28571-1-git-send-email-imunsie@au1.ibm.com> Cc: Frederic Weisbecker , Jason Baron , Oleg Nesterov , Steven Rostedt , Jeff Moyer , Ingo Molnar , Paul Mackerras , Ian Munsie , linux-fsdevel@vger.kernel.org, Andrew Morton , Alexander Viro X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org Errors-To: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org From: Ian Munsie This patch converts a number of syscalls from the generic code that had return types other than long to use the new COMPAT_SYSCALL_DEFINEx_RET macros so their metadata is recorded for tracing. Signed-off-by: Ian Munsie --- fs/compat.c | 24 ++++++++++++------------ ipc/compat_mq.c | 8 ++++---- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/fs/compat.c b/fs/compat.c index 9897b7b..edfa4b5 100644 --- a/fs/compat.c +++ b/fs/compat.c @@ -1224,9 +1224,9 @@ out: return ret; } -asmlinkage ssize_t -compat_sys_readv(unsigned long fd, const struct compat_iovec __user *vec, - unsigned long vlen) +COMPAT_SYSCALL_DEFINE3_RET(ssize_t, readv, unsigned long, fd, + const struct compat_iovec __user *, vec, + unsigned long, vlen) { struct file *file; int fput_needed; @@ -1240,9 +1240,9 @@ compat_sys_readv(unsigned long fd, const struct compat_iovec __user *vec, return ret; } -asmlinkage ssize_t -compat_sys_preadv(unsigned long fd, const struct compat_iovec __user *vec, - unsigned long vlen, u32 pos_low, u32 pos_high) +COMPAT_SYSCALL_DEFINE5_RET(ssize_t, preadv, unsigned long, fd, + const struct compat_iovec __user *, vec, + unsigned long, vlen, u32, pos_low, u32, pos_high) { loff_t pos = ((loff_t)pos_high << 32) | pos_low; struct file *file; @@ -1281,9 +1281,9 @@ out: return ret; } -asmlinkage ssize_t -compat_sys_writev(unsigned long fd, const struct compat_iovec __user *vec, - unsigned long vlen) +COMPAT_SYSCALL_DEFINE3_RET(ssize_t, writev, unsigned long, fd, + const struct compat_iovec __user *, vec, + unsigned long, vlen) { struct file *file; int fput_needed; @@ -1297,9 +1297,9 @@ compat_sys_writev(unsigned long fd, const struct compat_iovec __user *vec, return ret; } -asmlinkage ssize_t -compat_sys_pwritev(unsigned long fd, const struct compat_iovec __user *vec, - unsigned long vlen, u32 pos_low, u32 pos_high) +COMPAT_SYSCALL_DEFINE5_RET(ssize_t, pwritev, unsigned long, fd, + const struct compat_iovec __user *, vec, + unsigned long, vlen, u32, pos_low, u32, pos_high) { loff_t pos = ((loff_t)pos_high << 32) | pos_low; struct file *file; diff --git a/ipc/compat_mq.c b/ipc/compat_mq.c index 53593d3..22a394e 100644 --- a/ipc/compat_mq.c +++ b/ipc/compat_mq.c @@ -89,10 +89,10 @@ COMPAT_SYSCALL_DEFINE5(mq_timedsend, mqd_t, mqdes, msg_prio, u_ts); } -asmlinkage ssize_t compat_sys_mq_timedreceive(mqd_t mqdes, - char __user *u_msg_ptr, - size_t msg_len, unsigned int __user *u_msg_prio, - const struct compat_timespec __user *u_abs_timeout) +COMPAT_SYSCALL_DEFINE5_RET(ssize_t, mq_timedreceive, mqd_t, mqdes, + char __user *, u_msg_ptr, + size_t, msg_len, unsigned int __user *, u_msg_prio, + const struct compat_timespec __user *, u_abs_timeout) { struct timespec __user *u_ts; if (compat_prepare_timeout(&u_ts, u_abs_timeout))