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

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

fs: Replace current_fs_time() with current_time() 



current_fs_time() uses struct super_block* as an argument.
As per Linus's suggestion, this is changed to take struct
inode* as a parameter instead. This is because the function
is primarily meant for vfs inode timestamps.
Also the function was renamed as per Arnd's suggestion.

Change all calls to current_fs_time() to use the new
current_time() function instead. current_fs_time() will be
deleted.

Signed-off-by: default avatarDeepa Dinamani <deepa.kernel@gmail.com>
Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent 02027d42

drivers/char/sonypi.c

+1 −1
Original line number Diff line number Diff line
@@ -934,7 +934,7 @@ static ssize_t sonypi_misc_read(struct file *file, char __user *buf, 


	if (ret > 0) {

		struct inode *inode = file_inode(file);

		inode->i_atime = current_fs_time(inode->i_sb);

		inode->i_atime = current_time(inode);

	}



	return ret;

drivers/platform/x86/sony-laptop.c

+1 −1
Original line number Diff line number Diff line
@@ -4116,7 +4116,7 @@ static ssize_t sonypi_misc_read(struct file *file, char __user *buf, 


	if (ret > 0) {

		struct inode *inode = file_inode(file);

		inode->i_atime = current_fs_time(inode->i_sb);

		inode->i_atime = current_time(inode);

	}



	return ret;

fs/attr.c

+1 −1
Original line number Diff line number Diff line
@@ -209,7 +209,7 @@ int notify_change(struct dentry * dentry, struct iattr * attr, struct inode **de 
			inode->i_flags &= ~S_NOSEC;

	}



	now = current_fs_time(inode->i_sb);

	now = current_time(inode);



	attr->ia_ctime = now;

	if (!(ia_valid & ATTR_ATIME_SET))

fs/bad_inode.c

+1 −1
Original line number Diff line number Diff line
@@ -173,7 +173,7 @@ void make_bad_inode(struct inode *inode) 


	inode->i_mode = S_IFREG;

	inode->i_atime = inode->i_mtime = inode->i_ctime =

		current_fs_time(inode->i_sb);

		current_time(inode);

	inode->i_op = &bad_inode_ops;	

	inode->i_fop = &bad_file_ops;	

}

fs/binfmt_misc.c

+1 −1
Original line number Diff line number Diff line
@@ -584,7 +584,7 @@ static struct inode *bm_get_inode(struct super_block *sb, int mode) 
		inode->i_ino = get_next_ino();

		inode->i_mode = mode;

		inode->i_atime = inode->i_mtime = inode->i_ctime =

			current_fs_time(inode->i_sb);

			current_time(inode);

	}

	return inode;

}