Skip to contentSkip to conversation

struct timespec for stat - driver changes 2/3

PATCH New Andi Kleen 1 participant 1 message Oct 5, 2002

Subsystems (4)
USB Char and misc drivers Random number driver Sony vaio control device driver
lore
Share & tools
lore

Andi Kleen

author
#0 lore raw

PATCH 1/1 struct timespec for stat - driver changes 2/3

Required for the previous core timespec stat patch. This convers all the drivers to access the new datatype for i_amtime. No functional changes.

Patch for 2.5.40.

Please apply

-Andi

 linux-2.5.40-work/drivers/char/busmouse.c            |    2 +-
 linux-2.5.40-work/drivers/char/hp_psaux.c            |    4 ++--
 linux-2.5.40-work/drivers/char/qtronix.c             |    2 +-
 linux-2.5.40-work/drivers/char/random.c              |    2 +-
 linux-2.5.40-work/drivers/char/sonypi.c              |    2 +-
 linux-2.5.40-work/drivers/char/tty_io.c              |    4 ++--
 linux-2.5.40-work/drivers/hotplug/pci_hotplug_core.c |    2 +-
 linux-2.5.40-work/drivers/isdn/capi/capifs.c         |    2 +-
 linux-2.5.40-work/drivers/usb/core/inode.c           |    6 +++---
drivers/char/busmouse.c +1 -1
diff -burp -X ../KDIFX linux/drivers/char/busmouse.c linux-2.5.40-work/drivers/char/busmouse.c
@@ -316,7 +316,7 @@ repeat:
 	if (count > 3 && clear_user(buffer + 3, count - 3))
 		return -EFAULT;
 
-	file->f_dentry->d_inode->i_atime = CURRENT_TIME;
+	file->f_dentry->d_inode->i_atime = xtime;
 
 	return count;
 }
drivers/char/hp_psaux.c +2 -2
diff -burp -X ../KDIFX linux/drivers/char/hp_psaux.c linux-2.5.40-work/drivers/char/hp_psaux.c
@@ -289,7 +289,7 @@ static ssize_t write_aux(struct file * f
 		retval = -EIO;
 		if (written) {
 			retval = written;
-			file->f_dentry->d_inode->i_mtime = CURRENT_TIME;
+			file->f_dentry->d_inode->i_mtime = xtime;
 		}
 	}
 

@@ -324,7 +324,7 @@ repeat:
 		i--;
 	}
 	if (count-i) {
-		file->f_dentry->d_inode->i_atime = CURRENT_TIME;
+		file->f_dentry->d_inode->i_atime = xtime;
 		return count-i;
 	}
 	if (signal_pending(current))
drivers/char/qtronix.c +1 -1
diff -burp -X ../KDIFX linux/drivers/char/qtronix.c linux-2.5.40-work/drivers/char/qtronix.c
@@ -536,7 +536,7 @@ repeat:
 		i--;
 	}
 	if (count-i) {
-		file->f_dentry->d_inode->i_atime = CURRENT_TIME;
+		file->f_dentry->d_inode->i_atime = xtime;
 		return count-i;
 	}
 	if (signal_pending(current))
drivers/char/random.c +1 -1
diff -burp -X ../KDIFX linux/drivers/char/random.c linux-2.5.40-work/drivers/char/random.c
@@ -1597,7 +1597,7 @@ random_write(struct file * file, const c
 	if (p == buffer) {
 		return (ssize_t)ret;
 	} else {
-		file->f_dentry->d_inode->i_mtime = CURRENT_TIME;
+		file->f_dentry->d_inode->i_mtime = xtime;
 		mark_inode_dirty(file->f_dentry->d_inode);
 		return (ssize_t)(p - buffer);
 	}
drivers/char/sonypi.c +1 -1
diff -burp -X ../KDIFX linux/drivers/char/sonypi.c linux-2.5.40-work/drivers/char/sonypi.c
@@ -518,7 +518,7 @@ repeat:
 		i--;
         }
 	if (count - i) {
-		file->f_dentry->d_inode->i_atime = CURRENT_TIME;
+		file->f_dentry->d_inode->i_atime = xtime;
 		return count-i;
 	}
 	if (signal_pending(current))
drivers/char/tty_io.c +2 -2
diff -burp -X ../KDIFX linux/drivers/char/tty_io.c linux-2.5.40-work/drivers/char/tty_io.c
@@ -682,7 +682,7 @@ static ssize_t tty_read(struct file * fi
 		i = -EIO;
 	unlock_kernel();
 	if (i > 0)
-		inode->i_atime = CURRENT_TIME;
+		inode->i_atime = xtime;
 	return i;
 }
 

@@ -728,7 +728,7 @@ static inline ssize_t do_tty_write(
 		}
 	}
 	if (written) {
-		file->f_dentry->d_inode->i_mtime = CURRENT_TIME;
+		file->f_dentry->d_inode->i_mtime = xtime;
 		ret = written;
 	}
 	up(&tty->atomic_write);
drivers/hotplug/pci_hotplug_core.c +1 -1
diff -burp -X ../KDIFX linux/drivers/hotplug/pci_hotplug_core.c linux-2.5.40-work/drivers/hotplug/pci_hotplug_core.c
@@ -131,7 +131,7 @@ static struct inode *pcihpfs_get_inode (
 		inode->i_blksize = PAGE_CACHE_SIZE;
 		inode->i_blocks = 0;
 		inode->i_rdev = NODEV;
-		inode->i_atime = inode->i_mtime = inode->i_ctime = CURRENT_TIME;
+		inode->i_atime = inode->i_mtime = inode->i_ctime = xtime;
 		switch (mode & S_IFMT) {
 		default:
 			init_special_inode(inode, mode, dev);
drivers/isdn/capi/capifs.c +1 -1
diff -burp -X ../KDIFX linux/drivers/isdn/capi/capifs.c linux-2.5.40-work/drivers/isdn/capi/capifs.c
@@ -356,7 +356,7 @@ static struct inode *capifs_new_inode(st
 {
 	struct inode *inode = new_inode(sb);
 	if (inode) {
-		inode->i_mtime = inode->i_atime = inode->i_ctime = CURRENT_TIME;
+		inode->i_mtime = inode->i_atime = inode->i_ctime = xtime;
 		inode->i_blocks = 0;
 		inode->i_blksize = 1024;
 		inode->i_uid = inode->i_gid = 0;

Only in linux/drivers/pci: gen-devlist
Only in linux/drivers/scsi/aic7xxx: aic7xxx_reg.h

drivers/usb/core/inode.c +3 -3
diff -burp -X ../KDIFX linux/drivers/usb/core/inode.c linux-2.5.40-work/drivers/usb/core/inode.c
@@ -152,7 +152,7 @@ static struct inode *usbfs_get_inode (st
 		inode->i_blksize = PAGE_CACHE_SIZE;
 		inode->i_blocks = 0;
 		inode->i_rdev = NODEV;
-		inode->i_atime = inode->i_mtime = inode->i_ctime = CURRENT_TIME;
+		inode->i_atime = inode->i_mtime = inode->i_ctime = xtime;
 		switch (mode & S_IFMT) {
 		default:
 			init_special_inode(inode, mode, dev);

@@ -632,12 +632,12 @@ void usbfs_update_special (void)
 	if (devices_usbdevfs_dentry) {
 		inode = devices_usbdevfs_dentry->d_inode;
 		if (inode)
-			inode->i_atime = inode->i_mtime = inode->i_ctime = CURRENT_TIME;
+			inode->i_atime = inode->i_mtime = inode->i_ctime = xtime;
 	}
 	if (devices_usbfs_dentry) {
 		inode = devices_usbfs_dentry->d_inode;
 		if (inode)
-			inode->i_atime = inode->i_mtime = inode->i_ctime = CURRENT_TIME;
+			inode->i_atime = inode->i_mtime = inode->i_ctime = xtime;
 	}
 }