Re: [PATCH 12/14] fs/binfmt_aout.c: Use time_* macros

[Geert Uytterhoeven]

On Thu, 14 Feb 2008, S.Ã~GaÄ~_lar Onur wrote:
> The functions time_before, time_before_eq, time_after, and time_after_eq are more robust for comparing jiffies against other values.
> 
> So following patch implements usage of the time_after() macro, defined at linux/jiffies.h, which deals with wrapping correctly
> 
> Cc: linux-arch@xxxxxxxxxxxxxxx
> Signed-off-by: S.ÃaÄlar Onur <caglar@xxxxxxxxxxxxx>
> ---
>  fs/binfmt_aout.c |    7 ++++---
>  1 files changed, 4 insertions(+), 3 deletions(-)
> 
> diff --git a/fs/binfmt_aout.c b/fs/binfmt_aout.c
> index a1bb224..72757fe 100644
> --- a/fs/binfmt_aout.c
> +++ b/fs/binfmt_aout.c
> @@ -6,6 +6,7 @@
>  
>  #include <linux/module.h>
>  
> +#include <linux/jiffies.h>
>  #include <linux/time.h>
>  #include <linux/kernel.h>
>  #include <linux/mm.h>
> @@ -374,14 +375,14 @@ static int load_aout_binary(struct linux_binprm * bprm, struct pt_regs * regs)
>  	} else {
>  		static unsigned long error_time, error_time2;
>  		if ((ex.a_text & 0xfff || ex.a_data & 0xfff) &&
> -		    (N_MAGIC(ex) != NMAGIC) && (jiffies-error_time2) > 5*HZ)
> +		    (N_MAGIC(ex) != NMAGIC) && time_after(jiffies, error_time2 + 5 * HZ))
>  		{
>  			printk(KERN_NOTICE "executable not page aligned\n");
>  			error_time2 = jiffies;
>  		}
>
>  
>  		if ((fd_offset & ~PAGE_MASK) != 0 &&
> -		    (jiffies-error_time) > 5*HZ)
> +		    time_after(jiffies, error_time + 5 * HZ))
>  		{
>  			printk(KERN_WARNING 
>  			       "fd_offset is not page aligned. Please convert program: %s\n",
> @@ -498,7 +499,7 @@ static int load_aout_library(struct file *file)
>  		static unsigned long error_time;
>  		loff_t pos = N_TXTOFF(ex);
>  
> -		if ((jiffies-error_time) > 5*HZ)
> +		if (time_after(jiffies ,error_time + 5 * HZ))
>  		{
>  			printk(KERN_WARNING 
>  			       "N_TXTOFF is not page aligned. Please convert library: %s\n",

To me these constructs look like good candidates for replacement by
printk_ratelimit()?

Gr{oetje,eeting}s,

						Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@xxxxxxxxxxxxxx

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
							    -- Linus Torvalds