From mboxrd@z Thu Jan 1 00:00:00 1970 From: Joe Perches Subject: Re: [PATCH 2/2] x86: Useless inode var and Coding style fixes Date: Tue, 17 Sep 2013 22:25:28 -0700 Message-ID: <1379481928.1787.5.camel@joe-AO722> References: <1379472857-6473-1-git-send-email-geyslan@gmail.com> <1379472857-6473-2-git-send-email-geyslan@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset="ISO-8859-1" Content-Transfer-Encoding: 7bit Cc: viro@zeniv.linux.org.uk, linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org To: "Geyslan G. Bem" Return-path: In-Reply-To: <1379472857-6473-2-git-send-email-geyslan@gmail.com> Sender: linux-kernel-owner@vger.kernel.org List-Id: linux-fsdevel.vger.kernel.org On Tue, 2013-09-17 at 23:54 -0300, Geyslan G. Bem wrote: > Coding style and printk strings fixes. [] > diff --git a/fs/binfmt_aout.c b/fs/binfmt_aout.c [] > @@ -299,12 +301,12 @@ static int load_aout_binary(struct linux_binprm * bprm) > > if ((fd_offset & ~PAGE_MASK) != 0 && printk_ratelimit()) > { > - printk(KERN_WARNING > + printk(KERN_WARNING > "fd_offset is not page aligned. Please convert program: %s\n", > bprm->file->f_path.dentry->d_name.name); [] > @@ -388,12 +388,12 @@ static int load_aout_library(struct file *file) > if ((N_TXTOFF(ex) & ~PAGE_MASK) != 0) { > if (printk_ratelimit()) > { > - printk(KERN_WARNING > + printk(KERN_WARNING > "N_TXTOFF is not page aligned. Please convert library: %s\n", > file->f_path.dentry->d_name.name); I'd rather see these printks were fixed like this: --- fs/binfmt_aout.c | 24 ++++++++---------------- 1 file changed, 8 insertions(+), 16 deletions(-) diff --git a/fs/binfmt_aout.c b/fs/binfmt_aout.c index 89dec7f..3c9ec06 100644 --- a/fs/binfmt_aout.c +++ b/fs/binfmt_aout.c @@ -25,6 +25,7 @@ #include #include #include +#include #include #include @@ -292,17 +293,12 @@ static int load_aout_binary(struct linux_binprm * bprm) } } else { if ((ex.a_text & 0xfff || ex.a_data & 0xfff) && - (N_MAGIC(ex) != NMAGIC) && printk_ratelimit()) - { - printk(KERN_NOTICE "executable not page aligned\n"); - } + (N_MAGIC(ex) != NMAGIC)) + pr_notice_ratelimited("executable not page aligned\n"); - if ((fd_offset & ~PAGE_MASK) != 0 && printk_ratelimit()) - { - printk(KERN_WARNING - "fd_offset is not page aligned. Please convert program: %s\n", - bprm->file->f_path.dentry->d_name.name); - } + if ((fd_offset & ~PAGE_MASK) != 0) + pr_warn_ratelimited("fd_offset is not page aligned. Please convert program: %s\n", + bprm->file->f_path.dentry->d_name.name); if (!bprm->file->f_op->mmap||((fd_offset & ~PAGE_MASK) != 0)) { vm_brk(N_TXTADDR(ex), ex.a_text+ex.a_data); @@ -386,12 +382,8 @@ static int load_aout_library(struct file *file) start_addr = ex.a_entry & 0xfffff000; if ((N_TXTOFF(ex) & ~PAGE_MASK) != 0) { - if (printk_ratelimit()) - { - printk(KERN_WARNING - "N_TXTOFF is not page aligned. Please convert library: %s\n", - file->f_path.dentry->d_name.name); - } + pr_warn_ratelimited("N_TXTOFF is not page aligned. Please convert library: %s\n", + file->f_path.dentry->d_name.name); vm_brk(start_addr, ex.a_text + ex.a_data + ex.a_bss); read_code(file, start_addr, N_TXTOFF(ex),