From: Julia Lawall <[EMAIL PROTECTED]> The functions time_before, time_before_eq, time_after, and time_after_eq are more robust for comparing jiffies against other values.
A simplified version of the semantic patch making this change is as follows: (http://www.emn.fr/x-info/coccinelle/) // <smpl> @ change_compare_np @ expression E; @@ ( - jiffies <= E + time_before_eq(jiffies,E) | - jiffies >= E + time_after_eq(jiffies,E) | - jiffies < E + time_before(jiffies,E) | - jiffies > E + time_after(jiffies,E) ) @ include depends on change_compare_np @ @@ #include <linux/jiffies.h> @ no_include depends on !include && change_compare_np @ @@ #include <linux/...> + #include <linux/jiffies.h> // </smpl> Signed-off-by: Julia Lawall <[EMAIL PROTECTED]> --- diff -r -u -p a/fs/binfmt_aout.c b/fs/binfmt_aout.c --- a/fs/binfmt_aout.c 2007-12-21 06:57:19.000000000 +0100 +++ b/fs/binfmt_aout.c 2007-12-23 20:42:57.000000000 +0100 @@ -24,6 +24,7 @@ #include <linux/binfmts.h> #include <linux/personality.h> #include <linux/init.h> +#include <linux/jiffies.h> #include <asm/system.h> #include <asm/uaccess.h> @@ -373,14 +374,15 @@ static int load_aout_binary(struct linux } 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", @@ -497,7 +499,7 @@ static int load_aout_library(struct 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", diff -r -u -p a/fs/ncpfs/dir.c b/fs/ncpfs/dir.c --- a/fs/ncpfs/dir.c 2007-06-02 22:32:35.000000000 +0200 +++ b/fs/ncpfs/dir.c 2007-12-23 20:43:19.000000000 +0100 @@ -23,6 +23,7 @@ #include <linux/smp_lock.h> #include <linux/ncp_fs.h> +#include <linux/jiffies.h> #include "ncplib_kernel.h" @@ -447,7 +448,8 @@ static int ncp_readdir(struct file *filp goto init_cache; if (filp->f_pos == 2) { - if (jiffies - ctl.head.time >= NCP_MAX_AGE(server)) + if (time_before_eq(jiffies, + ctl.head.time + NCP_MAX_AGE(server))) goto init_cache; mtime = ncp_obtain_mtime(dentry); diff -r -u -p a/fs/smbfs/dir.c b/fs/smbfs/dir.c --- a/fs/smbfs/dir.c 2007-06-02 22:32:36.000000000 +0200 +++ b/fs/smbfs/dir.c 2007-12-23 20:43:34.000000000 +0100 @@ -18,6 +18,7 @@ #include <linux/smb_fs.h> #include <linux/smb_mount.h> #include <linux/smbno.h> +#include <linux/jiffies.h> #include "smb_debug.h" #include "proto.h" @@ -131,7 +132,7 @@ smb_readdir(struct file *filp, void *dir } if (filp->f_pos == 2) { - if (jiffies - ctl.head.time >= SMB_MAX_AGE(server)) + if (time_before_eq(jiffies, ctl.head.time+SMB_MAX_AGE(server))) goto init_cache; /* -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
