Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933612AbXLQCgZ (ORCPT ); Sun, 16 Dec 2007 21:36:25 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S935222AbXLQCf7 (ORCPT ); Sun, 16 Dec 2007 21:35:59 -0500 Received: from gepetto.dc.ltu.se ([130.240.42.40]:39637 "EHLO gepetto.dc.ltu.se" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S934975AbXLQCf5 (ORCPT ); Sun, 16 Dec 2007 21:35:57 -0500 Date: Mon, 17 Dec 2007 03:35:55 +0100 (MET) From: Richard Knutsson To: kernel-janitors@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Richard Knutsson Message-Id: <20071217023555.24944.62155.sendpatchset@thinktank.campus.ltu.se> Subject: [PATCH 1/3] ipc: Convert handmade 'max' to max(). Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1605 Lines: 55 Convert handmade 'max' to max(). Signed-off-by: Richard Knutsson --- msg.c | 2 +- sem.c | 2 +- shm.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ipc/msg.c b/ipc/msg.c index fdf3db5..74d0709 100644 --- a/ipc/msg.c +++ b/ipc/msg.c @@ -473,7 +473,7 @@ asmlinkage long sys_msgctl(int msqid, int cmd, struct msqid_ds __user *buf) up_read(&msg_ids(ns).rw_mutex); if (copy_to_user(buf, &msginfo, sizeof(struct msginfo))) return -EFAULT; - return (max_id < 0) ? 0 : max_id; + return max(max_id, 0); } case MSG_STAT: /* msqid is an index rather than a msg queue id */ case IPC_STAT: diff --git a/ipc/sem.c b/ipc/sem.c index 35952c0..9ac00ac 100644 --- a/ipc/sem.c +++ b/ipc/sem.c @@ -641,7 +641,7 @@ static int semctl_nolock(struct ipc_namespace *ns, int semid, int semnum, up_read(&sem_ids(ns).rw_mutex); if (copy_to_user (arg.__buf, &seminfo, sizeof(struct seminfo))) return -EFAULT; - return (max_id < 0) ? 0: max_id; + return max(max_id, 0); } case SEM_STAT: { diff --git a/ipc/shm.c b/ipc/shm.c index 3818fae..45e154a 100644 --- a/ipc/shm.c +++ b/ipc/shm.c @@ -704,7 +704,7 @@ asmlinkage long sys_shmctl (int shmid, int cmd, struct shmid_ds __user *buf) goto out; } - err = err < 0 ? 0 : err; + err = max(err, 0); goto out; } case SHM_STAT: -- 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/