diff mbox series

[62/79] smb: switch to new ctime accessors

Message ID 20230621144735.55953-61-jlayton@kernel.org (mailing list archive)
State New, archived
Headers show
Series None | expand

Commit Message

Jeff Layton June 21, 2023, 2:46 p.m. UTC 
In later patches, we're going to change how the ctime.tv_nsec field is
utilized. Switch to using accessor functions instead of raw accesses of
inode->i_ctime.

Signed-off-by: Jeff Layton <jlayton@kernel.org>
---
 fs/smb/client/file.c    |  4 ++--
 fs/smb/client/fscache.h |  5 +++--
 fs/smb/client/inode.c   | 15 +++++++--------
 fs/smb/client/smb2ops.c |  2 +-
 fs/smb/server/smb2pdu.c |  8 ++++----
 5 files changed, 17 insertions(+), 17 deletions(-)

Comments

Tom Talpey June 21, 2023, 5:45 p.m. UTC | #1 
On 6/21/2023 10:46 AM, Jeff Layton wrote:
> In later patches, we're going to change how the ctime.tv_nsec field is
> utilized. Switch to using accessor functions instead of raw accesses of
> inode->i_ctime.
> 
> Signed-off-by: Jeff Layton <jlayton@kernel.org>

Acked-by: Tom Talpey <tom@talpey.com>

> ---
>   fs/smb/client/file.c    |  4 ++--
>   fs/smb/client/fscache.h |  5 +++--
>   fs/smb/client/inode.c   | 15 +++++++--------
>   fs/smb/client/smb2ops.c |  2 +-
>   fs/smb/server/smb2pdu.c |  8 ++++----
>   5 files changed, 17 insertions(+), 17 deletions(-)
> 
> diff --git a/fs/smb/client/file.c b/fs/smb/client/file.c
> index 0a5fe8d5314b..07fed94b7501 100644
> --- a/fs/smb/client/file.c
> +++ b/fs/smb/client/file.c
> @@ -1085,7 +1085,7 @@ int cifs_close(struct inode *inode, struct file *file)
>   		    !test_bit(CIFS_INO_CLOSE_ON_LOCK, &cinode->flags) &&
>   		    dclose) {
>   			if (test_and_clear_bit(CIFS_INO_MODIFIED_ATTR, &cinode->flags)) {
> -				inode->i_ctime = inode->i_mtime = current_time(inode);
> +				inode->i_mtime = inode_ctime_set_current(inode);
>   			}
>   			spin_lock(&cinode->deferred_lock);
>   			cifs_add_deferred_close(cfile, dclose);
> @@ -2596,7 +2596,7 @@ static int cifs_partialpagewrite(struct page *page, unsigned from, unsigned to)
>   					   write_data, to - from, &offset);
>   		cifsFileInfo_put(open_file);
>   		/* Does mm or vfs already set times? */
> -		inode->i_atime = inode->i_mtime = inode->i_ctime = current_time(inode);
> +		inode->i_atime = inode->i_mtime = inode_ctime_set_current(inode);
>   		if ((bytes_written > 0) && (offset))
>   			rc = 0;
>   		else if (bytes_written < 0)
> diff --git a/fs/smb/client/fscache.h b/fs/smb/client/fscache.h
> index 173999610997..1c50d286c3a4 100644
> --- a/fs/smb/client/fscache.h
> +++ b/fs/smb/client/fscache.h
> @@ -50,12 +50,13 @@ void cifs_fscache_fill_coherency(struct inode *inode,
>   				 struct cifs_fscache_inode_coherency_data *cd)
>   {
>   	struct cifsInodeInfo *cifsi = CIFS_I(inode);
> +	struct timespec64 ctime = inode_ctime_peek(&cifsi->netfs.inode);
>   
>   	memset(cd, 0, sizeof(*cd));
>   	cd->last_write_time_sec   = cpu_to_le64(cifsi->netfs.inode.i_mtime.tv_sec);
>   	cd->last_write_time_nsec  = cpu_to_le32(cifsi->netfs.inode.i_mtime.tv_nsec);
> -	cd->last_change_time_sec  = cpu_to_le64(cifsi->netfs.inode.i_ctime.tv_sec);
> -	cd->last_change_time_nsec = cpu_to_le32(cifsi->netfs.inode.i_ctime.tv_nsec);
> +	cd->last_change_time_sec  = cpu_to_le64(ctime.tv_sec);
> +	cd->last_change_time_nsec = cpu_to_le32(ctime.tv_nsec);
>   }
>   
>   
> diff --git a/fs/smb/client/inode.c b/fs/smb/client/inode.c
> index 1087ac6104a9..d986b280b6c3 100644
> --- a/fs/smb/client/inode.c
> +++ b/fs/smb/client/inode.c
> @@ -172,7 +172,7 @@ cifs_fattr_to_inode(struct inode *inode, struct cifs_fattr *fattr)
>   	else
>   		inode->i_atime = fattr->cf_atime;
>   	inode->i_mtime = fattr->cf_mtime;
> -	inode->i_ctime = fattr->cf_ctime;
> +	inode_ctime_set(inode, fattr->cf_ctime);
>   	inode->i_rdev = fattr->cf_rdev;
>   	cifs_nlink_fattr_to_inode(inode, fattr);
>   	inode->i_uid = fattr->cf_uid;
> @@ -1744,9 +1744,9 @@ int cifs_unlink(struct inode *dir, struct dentry *dentry)
>   		cifs_inode = CIFS_I(inode);
>   		cifs_inode->time = 0;	/* will force revalidate to get info
>   					   when needed */
> -		inode->i_ctime = current_time(inode);
> +		inode_ctime_set_current(inode);
>   	}
> -	dir->i_ctime = dir->i_mtime = current_time(dir);
> +	dir->i_mtime = inode_ctime_set_current(dir);
>   	cifs_inode = CIFS_I(dir);
>   	CIFS_I(dir)->time = 0;	/* force revalidate of dir as well */
>   unlink_out:
> @@ -2060,8 +2060,8 @@ int cifs_rmdir(struct inode *inode, struct dentry *direntry)
>   	 */
>   	cifsInode->time = 0;
>   
> -	d_inode(direntry)->i_ctime = inode->i_ctime = inode->i_mtime =
> -		current_time(inode);
> +	inode->i_mtime = inode_ctime_set_current(inode);
> +	inode_ctime_set(d_inode(direntry), inode->i_mtime);
>   
>   rmdir_exit:
>   	free_dentry_path(page);
> @@ -2267,9 +2267,8 @@ cifs_rename2(struct mnt_idmap *idmap, struct inode *source_dir,
>   	/* force revalidate to go get info when needed */
>   	CIFS_I(source_dir)->time = CIFS_I(target_dir)->time = 0;
>   
> -	source_dir->i_ctime = source_dir->i_mtime = target_dir->i_ctime =
> -		target_dir->i_mtime = current_time(source_dir);
> -
> +	source_dir->i_mtime = inode_ctime_set_current(source_dir);
> +	target_dir->i_mtime = inode_ctime_set_current(target_dir);
>   cifs_rename_exit:
>   	kfree(info_buf_source);
>   	free_dentry_path(page2);
> diff --git a/fs/smb/client/smb2ops.c b/fs/smb/client/smb2ops.c
> index 5639d8c48570..52564a5dd2b1 100644
> --- a/fs/smb/client/smb2ops.c
> +++ b/fs/smb/client/smb2ops.c
> @@ -1391,7 +1391,7 @@ smb2_close_getattr(const unsigned int xid, struct cifs_tcon *tcon,
>   	if (file_inf.LastWriteTime)
>   		inode->i_mtime = cifs_NTtimeToUnix(file_inf.LastWriteTime);
>   	if (file_inf.ChangeTime)
> -		inode->i_ctime = cifs_NTtimeToUnix(file_inf.ChangeTime);
> +		inode_ctime_set(inode, cifs_NTtimeToUnix(file_inf.ChangeTime));
>   	if (file_inf.LastAccessTime)
>   		inode->i_atime = cifs_NTtimeToUnix(file_inf.LastAccessTime);
>   
> diff --git a/fs/smb/server/smb2pdu.c b/fs/smb/server/smb2pdu.c
> index d31926194ebf..7a741ab6835c 100644
> --- a/fs/smb/server/smb2pdu.c
> +++ b/fs/smb/server/smb2pdu.c
> @@ -4768,7 +4768,7 @@ static int find_file_posix_info(struct smb2_query_info_rsp *rsp,
>   	file_info->LastAccessTime = cpu_to_le64(time);
>   	time = ksmbd_UnixTimeToNT(inode->i_mtime);
>   	file_info->LastWriteTime = cpu_to_le64(time);
> -	time = ksmbd_UnixTimeToNT(inode->i_ctime);
> +	time = ksmbd_UnixTimeToNT(inode_ctime_peek(inode));
>   	file_info->ChangeTime = cpu_to_le64(time);
>   	file_info->DosAttributes = fp->f_ci->m_fattr;
>   	file_info->Inode = cpu_to_le64(inode->i_ino);
> @@ -5409,7 +5409,7 @@ int smb2_close(struct ksmbd_work *work)
>   		rsp->LastAccessTime = cpu_to_le64(time);
>   		time = ksmbd_UnixTimeToNT(inode->i_mtime);
>   		rsp->LastWriteTime = cpu_to_le64(time);
> -		time = ksmbd_UnixTimeToNT(inode->i_ctime);
> +		time = ksmbd_UnixTimeToNT(inode_ctime_peek(inode));
>   		rsp->ChangeTime = cpu_to_le64(time);
>   		ksmbd_fd_put(work, fp);
>   	} else {
> @@ -5628,7 +5628,7 @@ static int set_file_basic_info(struct ksmbd_file *fp,
>   	if (file_info->ChangeTime)
>   		attrs.ia_ctime = ksmbd_NTtimeToUnix(file_info->ChangeTime);
>   	else
> -		attrs.ia_ctime = inode->i_ctime;
> +		attrs.ia_ctime = inode_ctime_peek(inode);
>   
>   	if (file_info->LastWriteTime) {
>   		attrs.ia_mtime = ksmbd_NTtimeToUnix(file_info->LastWriteTime);
> @@ -5673,7 +5673,7 @@ static int set_file_basic_info(struct ksmbd_file *fp,
>   			return -EACCES;
>   
>   		inode_lock(inode);
> -		inode->i_ctime = attrs.ia_ctime;
> +		inode_ctime_set(inode, attrs.ia_ctime);
>   		attrs.ia_valid &= ~ATTR_CTIME;
>   		rc = notify_change(idmap, dentry, &attrs, NULL);
>   		inode_unlock(inode);
Sergey Senozhatsky June 23, 2023, 5:03 a.m. UTC | #2 
On (23/06/21 10:46), Jeff Layton wrote:
> 
> In later patches, we're going to change how the ctime.tv_nsec field is
> utilized. Switch to using accessor functions instead of raw accesses of
> inode->i_ctime.
> 
> Signed-off-by: Jeff Layton <jlayton@kernel.org>

Reviewed-by: Sergey Senozhatsky <senozhatsky@chromium.org>
diff mbox series

Patch

diff --git a/fs/smb/client/file.c b/fs/smb/client/file.c
index 0a5fe8d5314b..07fed94b7501 100644
--- a/fs/smb/client/file.c
+++ b/fs/smb/client/file.c
@@ -1085,7 +1085,7 @@  int cifs_close(struct inode *inode, struct file *file)
 		    !test_bit(CIFS_INO_CLOSE_ON_LOCK, &cinode->flags) &&
 		    dclose) {
 			if (test_and_clear_bit(CIFS_INO_MODIFIED_ATTR, &cinode->flags)) {
-				inode->i_ctime = inode->i_mtime = current_time(inode);
+				inode->i_mtime = inode_ctime_set_current(inode);
 			}
 			spin_lock(&cinode->deferred_lock);
 			cifs_add_deferred_close(cfile, dclose);
@@ -2596,7 +2596,7 @@  static int cifs_partialpagewrite(struct page *page, unsigned from, unsigned to)
 					   write_data, to - from, &offset);
 		cifsFileInfo_put(open_file);
 		/* Does mm or vfs already set times? */
-		inode->i_atime = inode->i_mtime = inode->i_ctime = current_time(inode);
+		inode->i_atime = inode->i_mtime = inode_ctime_set_current(inode);
 		if ((bytes_written > 0) && (offset))
 			rc = 0;
 		else if (bytes_written < 0)
diff --git a/fs/smb/client/fscache.h b/fs/smb/client/fscache.h
index 173999610997..1c50d286c3a4 100644
--- a/fs/smb/client/fscache.h
+++ b/fs/smb/client/fscache.h
@@ -50,12 +50,13 @@  void cifs_fscache_fill_coherency(struct inode *inode,
 				 struct cifs_fscache_inode_coherency_data *cd)
 {
 	struct cifsInodeInfo *cifsi = CIFS_I(inode);
+	struct timespec64 ctime = inode_ctime_peek(&cifsi->netfs.inode);
 
 	memset(cd, 0, sizeof(*cd));
 	cd->last_write_time_sec   = cpu_to_le64(cifsi->netfs.inode.i_mtime.tv_sec);
 	cd->last_write_time_nsec  = cpu_to_le32(cifsi->netfs.inode.i_mtime.tv_nsec);
-	cd->last_change_time_sec  = cpu_to_le64(cifsi->netfs.inode.i_ctime.tv_sec);
-	cd->last_change_time_nsec = cpu_to_le32(cifsi->netfs.inode.i_ctime.tv_nsec);
+	cd->last_change_time_sec  = cpu_to_le64(ctime.tv_sec);
+	cd->last_change_time_nsec = cpu_to_le32(ctime.tv_nsec);
 }
 
 
diff --git a/fs/smb/client/inode.c b/fs/smb/client/inode.c
index 1087ac6104a9..d986b280b6c3 100644
--- a/fs/smb/client/inode.c
+++ b/fs/smb/client/inode.c
@@ -172,7 +172,7 @@  cifs_fattr_to_inode(struct inode *inode, struct cifs_fattr *fattr)
 	else
 		inode->i_atime = fattr->cf_atime;
 	inode->i_mtime = fattr->cf_mtime;
-	inode->i_ctime = fattr->cf_ctime;
+	inode_ctime_set(inode, fattr->cf_ctime);
 	inode->i_rdev = fattr->cf_rdev;
 	cifs_nlink_fattr_to_inode(inode, fattr);
 	inode->i_uid = fattr->cf_uid;
@@ -1744,9 +1744,9 @@  int cifs_unlink(struct inode *dir, struct dentry *dentry)
 		cifs_inode = CIFS_I(inode);
 		cifs_inode->time = 0;	/* will force revalidate to get info
 					   when needed */
-		inode->i_ctime = current_time(inode);
+		inode_ctime_set_current(inode);
 	}
-	dir->i_ctime = dir->i_mtime = current_time(dir);
+	dir->i_mtime = inode_ctime_set_current(dir);
 	cifs_inode = CIFS_I(dir);
 	CIFS_I(dir)->time = 0;	/* force revalidate of dir as well */
 unlink_out:
@@ -2060,8 +2060,8 @@  int cifs_rmdir(struct inode *inode, struct dentry *direntry)
 	 */
 	cifsInode->time = 0;
 
-	d_inode(direntry)->i_ctime = inode->i_ctime = inode->i_mtime =
-		current_time(inode);
+	inode->i_mtime = inode_ctime_set_current(inode);
+	inode_ctime_set(d_inode(direntry), inode->i_mtime);
 
 rmdir_exit:
 	free_dentry_path(page);
@@ -2267,9 +2267,8 @@  cifs_rename2(struct mnt_idmap *idmap, struct inode *source_dir,
 	/* force revalidate to go get info when needed */
 	CIFS_I(source_dir)->time = CIFS_I(target_dir)->time = 0;
 
-	source_dir->i_ctime = source_dir->i_mtime = target_dir->i_ctime =
-		target_dir->i_mtime = current_time(source_dir);
-
+	source_dir->i_mtime = inode_ctime_set_current(source_dir);
+	target_dir->i_mtime = inode_ctime_set_current(target_dir);
 cifs_rename_exit:
 	kfree(info_buf_source);
 	free_dentry_path(page2);
diff --git a/fs/smb/client/smb2ops.c b/fs/smb/client/smb2ops.c
index 5639d8c48570..52564a5dd2b1 100644
--- a/fs/smb/client/smb2ops.c
+++ b/fs/smb/client/smb2ops.c
@@ -1391,7 +1391,7 @@  smb2_close_getattr(const unsigned int xid, struct cifs_tcon *tcon,
 	if (file_inf.LastWriteTime)
 		inode->i_mtime = cifs_NTtimeToUnix(file_inf.LastWriteTime);
 	if (file_inf.ChangeTime)
-		inode->i_ctime = cifs_NTtimeToUnix(file_inf.ChangeTime);
+		inode_ctime_set(inode, cifs_NTtimeToUnix(file_inf.ChangeTime));
 	if (file_inf.LastAccessTime)
 		inode->i_atime = cifs_NTtimeToUnix(file_inf.LastAccessTime);
 
diff --git a/fs/smb/server/smb2pdu.c b/fs/smb/server/smb2pdu.c
index d31926194ebf..7a741ab6835c 100644
--- a/fs/smb/server/smb2pdu.c
+++ b/fs/smb/server/smb2pdu.c
@@ -4768,7 +4768,7 @@  static int find_file_posix_info(struct smb2_query_info_rsp *rsp,
 	file_info->LastAccessTime = cpu_to_le64(time);
 	time = ksmbd_UnixTimeToNT(inode->i_mtime);
 	file_info->LastWriteTime = cpu_to_le64(time);
-	time = ksmbd_UnixTimeToNT(inode->i_ctime);
+	time = ksmbd_UnixTimeToNT(inode_ctime_peek(inode));
 	file_info->ChangeTime = cpu_to_le64(time);
 	file_info->DosAttributes = fp->f_ci->m_fattr;
 	file_info->Inode = cpu_to_le64(inode->i_ino);
@@ -5409,7 +5409,7 @@  int smb2_close(struct ksmbd_work *work)
 		rsp->LastAccessTime = cpu_to_le64(time);
 		time = ksmbd_UnixTimeToNT(inode->i_mtime);
 		rsp->LastWriteTime = cpu_to_le64(time);
-		time = ksmbd_UnixTimeToNT(inode->i_ctime);
+		time = ksmbd_UnixTimeToNT(inode_ctime_peek(inode));
 		rsp->ChangeTime = cpu_to_le64(time);
 		ksmbd_fd_put(work, fp);
 	} else {
@@ -5628,7 +5628,7 @@  static int set_file_basic_info(struct ksmbd_file *fp,
 	if (file_info->ChangeTime)
 		attrs.ia_ctime = ksmbd_NTtimeToUnix(file_info->ChangeTime);
 	else
-		attrs.ia_ctime = inode->i_ctime;
+		attrs.ia_ctime = inode_ctime_peek(inode);
 
 	if (file_info->LastWriteTime) {
 		attrs.ia_mtime = ksmbd_NTtimeToUnix(file_info->LastWriteTime);
@@ -5673,7 +5673,7 @@  static int set_file_basic_info(struct ksmbd_file *fp,
 			return -EACCES;
 
 		inode_lock(inode);
-		inode->i_ctime = attrs.ia_ctime;
+		inode_ctime_set(inode, attrs.ia_ctime);
 		attrs.ia_valid &= ~ATTR_CTIME;
 		rc = notify_change(idmap, dentry, &attrs, NULL);
 		inode_unlock(inode);