Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 078cd827 authored by Deepa Dinamani's avatar Deepa Dinamani Committed by Al Viro
Browse files

fs: Replace CURRENT_TIME with current_time() for inode timestamps 



CURRENT_TIME macro is not appropriate for filesystems as it
doesn't use the right granularity for filesystem timestamps.
Use current_time() instead.

CURRENT_TIME is also not y2038 safe.

This is also in preparation for the patch that transitions
vfs timestamps to use 64 bit time and hence make them
y2038 safe. As part of the effort current_time() will be
extended to do range checks. Hence, it is necessary for all
file system timestamps to use current_time(). Also,
current_time() will be transitioned along with vfs to be
y2038 safe.

Note that whenever a single call to current_time() is used
to change timestamps in different inodes, it is because they
share the same time granularity.

Signed-off-by: default avatarDeepa Dinamani <deepa.kernel@gmail.com>
Reviewed-by: default avatarArnd Bergmann <arnd@arndb.de>
Acked-by: default avatarFelipe Balbi <balbi@kernel.org>
Acked-by: default avatarSteven Whitehouse <swhiteho@redhat.com>
Acked-by: default avatarRyusuke Konishi <konishi.ryusuke@lab.ntt.co.jp>
Acked-by: default avatarDavid Sterba <dsterba@suse.com>
Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent 2554c72e

arch/powerpc/platforms/cell/spufs/inode.c

+1 −1
Original line number Diff line number Diff line
@@ -103,7 +103,7 @@ spufs_new_inode(struct super_block *sb, umode_t mode) 
	inode->i_mode = mode;

	inode->i_uid = current_fsuid();

	inode->i_gid = current_fsgid();

	inode->i_atime = inode->i_mtime = inode->i_ctime = CURRENT_TIME;

	inode->i_atime = inode->i_mtime = inode->i_ctime = current_time(inode);

out:

	return inode;

}

arch/s390/hypfs/inode.c

+2 −2
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ static void hypfs_update_update(struct super_block *sb) 
	struct inode *inode = d_inode(sb_info->update_file);



	sb_info->last_update = get_seconds();

	inode->i_atime = inode->i_mtime = inode->i_ctime = CURRENT_TIME;

	inode->i_atime = inode->i_mtime = inode->i_ctime = current_time(inode);

}



/* directory tree removal functions */
@@ -99,7 +99,7 @@ static struct inode *hypfs_make_inode(struct super_block *sb, umode_t mode) 
		ret->i_mode = mode;

		ret->i_uid = hypfs_info->uid;

		ret->i_gid = hypfs_info->gid;

		ret->i_atime = ret->i_mtime = ret->i_ctime = CURRENT_TIME;

		ret->i_atime = ret->i_mtime = ret->i_ctime = current_time(ret);

		if (S_ISDIR(mode))

			set_nlink(ret, 2);

	}

drivers/infiniband/hw/qib/qib_fs.c

+1 −1
Original line number Diff line number Diff line
@@ -64,7 +64,7 @@ static int qibfs_mknod(struct inode *dir, struct dentry *dentry, 
	inode->i_uid = GLOBAL_ROOT_UID;

	inode->i_gid = GLOBAL_ROOT_GID;

	inode->i_blocks = 0;

	inode->i_atime = CURRENT_TIME;

	inode->i_atime = current_time(inode);

	inode->i_mtime = inode->i_atime;

	inode->i_ctime = inode->i_atime;

	inode->i_private = data;

drivers/misc/ibmasm/ibmasmfs.c

+1 −1
Original line number Diff line number Diff line
@@ -144,7 +144,7 @@ static struct inode *ibmasmfs_make_inode(struct super_block *sb, int mode) 
	if (ret) {

		ret->i_ino = get_next_ino();

		ret->i_mode = mode;

		ret->i_atime = ret->i_mtime = ret->i_ctime = CURRENT_TIME;

		ret->i_atime = ret->i_mtime = ret->i_ctime = current_time(ret);

	}

	return ret;

}

drivers/oprofile/oprofilefs.c

+1 −1
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ static struct inode *oprofilefs_get_inode(struct super_block *sb, int mode) 
	if (inode) {

		inode->i_ino = get_next_ino();

		inode->i_mode = mode;

		inode->i_atime = inode->i_mtime = inode->i_ctime = CURRENT_TIME;

		inode->i_atime = inode->i_mtime = inode->i_ctime = current_time(inode);

	}

	return inode;

}