From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755073AbZBOSui (ORCPT ); Sun, 15 Feb 2009 13:50:38 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752740AbZBOSu3 (ORCPT ); Sun, 15 Feb 2009 13:50:29 -0500 Received: from ti-out-0910.google.com ([209.85.142.184]:33100 "EHLO ti-out-0910.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752706AbZBOSu2 (ORCPT ); Sun, 15 Feb 2009 13:50:28 -0500 DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=mime-version:date:message-id:subject:from:to:cc:content-type :content-transfer-encoding; b=Jcnlg0NfLuOdjzZh7dgvufcqLXS+qF9t8UT0eDQlsJH4r9dL8HTiNpautsRRz9Ehyy +XSe80ktK4IslQAh1e3lZSAH30wgJje/hH2y/oBXJ4GSgUV77jhT3VuHB4axkHSIUbx4 g0yRVYJxX5Ve4m+ntVsIf+t3GIP6r+x081keQ= MIME-Version: 1.0 Date: Mon, 16 Feb 2009 00:20:25 +0530 Message-ID: Subject: [PATCH] Remove errors caught by checkpatch.pl in kernel/acct.c From: Manish Katiyar To: mingo@elte.hu, LKML , kernel-janitors@vger.kernel.org Cc: mkatiyar@gmail.com Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi, Below patch removes errors generated by checkpatch.pl in kernel/acct.c. Caught by Ingo's code-quality script. Signed-off-by: Manish Katiyar --- kernel/acct.c | 27 ++++++++++++++------------- 1 files changed, 14 insertions(+), 13 deletions(-) diff --git a/kernel/acct.c b/kernel/acct.c index 7afa315..00fbf8e 100644 --- a/kernel/acct.c +++ b/kernel/acct.c @@ -144,7 +144,7 @@ static int check_free_space(struct bsd_acct_struct *acct, struct file *file) spin_lock(&acct_lock); if (file != acct->file) { if (act) - res = act>0; + res = act > 0; goto out; } @@ -287,7 +287,7 @@ SYSCALL_DEFINE1(acct, const char __user *, name) if (name) { char *tmp = getname(name); if (IS_ERR(tmp)) - return (PTR_ERR(tmp)); + return PTR_ERR(tmp); error = acct_on(tmp); putname(tmp); } else { @@ -403,7 +403,7 @@ static comp_t encode_comp_t(unsigned long value) return exp; } -#if ACCT_VERSION==1 || ACCT_VERSION==2 +#if ACCT_VERSION == 1 || ACCT_VERSION == 2 /* * encode an u64 into a comp2_t (24 bits) * @@ -416,7 +416,7 @@ static comp_t encode_comp_t(unsigned long value) #define MANTSIZE2 20 /* 20 bit mantissa. */ #define EXPSIZE2 5 /* 5 bit base 2 exponent. */ #define MAXFRACT2 ((1ul << MANTSIZE2) - 1) /* Maximum fractional value. */ -#define MAXEXP2 ((1 < 0){ + if (value == 0) + return 0; + while ((s64)value > 0) { value <<= 1; exp--; } @@ -513,13 +514,13 @@ static void do_acct_process(struct bsd_acct_struct *acct, + current->group_leader->start_time.tv_nsec; /* convert nsec -> AHZ */ elapsed = nsec_to_AHZ(run_time); -#if ACCT_VERSION==3 +#if ACCT_VERSION == 3 ac.ac_etime = encode_float(elapsed); #else ac.ac_etime = encode_comp_t(elapsed < (unsigned long) -1l ? - (unsigned long) elapsed : (unsigned long) -1l); + (unsigned long) elapsed:(unsigned long) -1l); #endif -#if ACCT_VERSION==1 || ACCT_VERSION==2 +#if ACCT_VERSION == 1 || ACCT_VERSION == 2 { /* new enlarged etime field */ comp2_t etime = encode_comp2_t(elapsed); @@ -531,15 +532,15 @@ static void do_acct_process(struct bsd_acct_struct *acct, ac.ac_btime = get_seconds() - elapsed; /* we really need to bite the bullet and change layout */ current_uid_gid(&ac.ac_uid, &ac.ac_gid); -#if ACCT_VERSION==2 +#if ACCT_VERSION == 2 ac.ac_ahz = AHZ; #endif -#if ACCT_VERSION==1 || ACCT_VERSION==2 +#if ACCT_VERSION == 1 || ACCT_VERSION == 2 /* backward-compatible 16 bit fields */ ac.ac_uid16 = ac.ac_uid; ac.ac_gid16 = ac.ac_gid; #endif -#if ACCT_VERSION==3 +#if ACCT_VERSION == 3 ac.ac_pid = task_tgid_nr_ns(current, ns); rcu_read_lock(); ac.ac_ppid = task_tgid_nr_ns(rcu_dereference(current->real_parent), ns); -- 1.5.4.3 Thanks - Manish