Commit e86d5a02 authored by Trond Myklebust's avatar Trond Myklebust
Browse files

NFS: Convert struct nfs_fattr to use struct timespec64 



NFSv4 supports 64-bit times, so we should switch to using struct
timespec64 when decoding attributes.

Signed-off-by: default avatarTrond Myklebust <trond.myklebust@hammerspace.com>
parent 22a1ae9a

fs/nfs/inode.c

+27 −27
Original line number Diff line number Diff line
@@ -504,15 +504,15 @@ nfs_fhget(struct super_block *sb, struct nfs_fh *fh, struct nfs_fattr *fattr, st 
		nfsi->read_cache_jiffies = fattr->time_start;

		nfsi->attr_gencount = fattr->gencount;

		if (fattr->valid & NFS_ATTR_FATTR_ATIME)

			inode->i_atime = timespec_to_timespec64(fattr->atime);

			inode->i_atime = fattr->atime;

		else if (nfs_server_capable(inode, NFS_CAP_ATIME))

			nfs_set_cache_invalid(inode, NFS_INO_INVALID_ATIME);

		if (fattr->valid & NFS_ATTR_FATTR_MTIME)

			inode->i_mtime = timespec_to_timespec64(fattr->mtime);

			inode->i_mtime = fattr->mtime;

		else if (nfs_server_capable(inode, NFS_CAP_MTIME))

			nfs_set_cache_invalid(inode, NFS_INO_INVALID_MTIME);

		if (fattr->valid & NFS_ATTR_FATTR_CTIME)

			inode->i_ctime = timespec_to_timespec64(fattr->ctime);

			inode->i_ctime = fattr->ctime;

		else if (nfs_server_capable(inode, NFS_CAP_CTIME))

			nfs_set_cache_invalid(inode, NFS_INO_INVALID_CTIME);

		if (fattr->valid & NFS_ATTR_FATTR_CHANGE)
@@ -698,7 +698,7 @@ void nfs_setattr_update_inode(struct inode *inode, struct iattr *attr, 
		if ((attr->ia_valid & ATTR_GID) != 0)

			inode->i_gid = attr->ia_gid;

		if (fattr->valid & NFS_ATTR_FATTR_CTIME)

			inode->i_ctime = timespec_to_timespec64(fattr->ctime);

			inode->i_ctime = fattr->ctime;

		else

			nfs_set_cache_invalid(inode, NFS_INO_INVALID_CHANGE

					| NFS_INO_INVALID_CTIME);
@@ -709,14 +709,14 @@ void nfs_setattr_update_inode(struct inode *inode, struct iattr *attr, 
		NFS_I(inode)->cache_validity &= ~(NFS_INO_INVALID_ATIME

				| NFS_INO_INVALID_CTIME);

		if (fattr->valid & NFS_ATTR_FATTR_ATIME)

			inode->i_atime = timespec_to_timespec64(fattr->atime);

			inode->i_atime = fattr->atime;

		else if (attr->ia_valid & ATTR_ATIME_SET)

			inode->i_atime = attr->ia_atime;

		else

			nfs_set_cache_invalid(inode, NFS_INO_INVALID_ATIME);



		if (fattr->valid & NFS_ATTR_FATTR_CTIME)

			inode->i_ctime = timespec_to_timespec64(fattr->ctime);

			inode->i_ctime = fattr->ctime;

		else

			nfs_set_cache_invalid(inode, NFS_INO_INVALID_CHANGE

					| NFS_INO_INVALID_CTIME);
@@ -725,14 +725,14 @@ void nfs_setattr_update_inode(struct inode *inode, struct iattr *attr, 
		NFS_I(inode)->cache_validity &= ~(NFS_INO_INVALID_MTIME

				| NFS_INO_INVALID_CTIME);

		if (fattr->valid & NFS_ATTR_FATTR_MTIME)

			inode->i_mtime = timespec_to_timespec64(fattr->mtime);

			inode->i_mtime = fattr->mtime;

		else if (attr->ia_valid & ATTR_MTIME_SET)

			inode->i_mtime = attr->ia_mtime;

		else

			nfs_set_cache_invalid(inode, NFS_INO_INVALID_MTIME);



		if (fattr->valid & NFS_ATTR_FATTR_CTIME)

			inode->i_ctime = timespec_to_timespec64(fattr->ctime);

			inode->i_ctime = fattr->ctime;

		else

			nfs_set_cache_invalid(inode, NFS_INO_INVALID_CHANGE

					| NFS_INO_INVALID_CTIME);
@@ -1351,7 +1351,7 @@ static bool nfs_file_has_buffered_writers(struct nfs_inode *nfsi) 


static void nfs_wcc_update_inode(struct inode *inode, struct nfs_fattr *fattr)

{

	struct timespec ts;

	struct timespec64 ts;



	if ((fattr->valid & NFS_ATTR_FATTR_PRECHANGE)

			&& (fattr->valid & NFS_ATTR_FATTR_CHANGE)
@@ -1361,18 +1361,18 @@ static void nfs_wcc_update_inode(struct inode *inode, struct nfs_fattr *fattr) 
			nfs_set_cache_invalid(inode, NFS_INO_INVALID_DATA);

	}

	/* If we have atomic WCC data, we may update some attributes */

	ts = timespec64_to_timespec(inode->i_ctime);

	ts = inode->i_ctime;

	if ((fattr->valid & NFS_ATTR_FATTR_PRECTIME)

			&& (fattr->valid & NFS_ATTR_FATTR_CTIME)

			&& timespec_equal(&ts, &fattr->pre_ctime)) {

		inode->i_ctime = timespec_to_timespec64(fattr->ctime);

			&& timespec64_equal(&ts, &fattr->pre_ctime)) {

		inode->i_ctime = fattr->ctime;

	}



	ts = timespec64_to_timespec(inode->i_mtime);

	ts = inode->i_mtime;

	if ((fattr->valid & NFS_ATTR_FATTR_PREMTIME)

			&& (fattr->valid & NFS_ATTR_FATTR_MTIME)

			&& timespec_equal(&ts, &fattr->pre_mtime)) {

		inode->i_mtime = timespec_to_timespec64(fattr->mtime);

			&& timespec64_equal(&ts, &fattr->pre_mtime)) {

		inode->i_mtime = fattr->mtime;

		if (S_ISDIR(inode->i_mode))

			nfs_set_cache_invalid(inode, NFS_INO_INVALID_DATA);

	}
@@ -1398,7 +1398,7 @@ static int nfs_check_inode_attributes(struct inode *inode, struct nfs_fattr *fat 
	struct nfs_inode *nfsi = NFS_I(inode);

	loff_t cur_size, new_isize;

	unsigned long invalid = 0;

	struct timespec ts;

	struct timespec64 ts;



	if (NFS_PROTO(inode)->have_delegation(inode, FMODE_READ))

		return 0;
@@ -1425,12 +1425,12 @@ static int nfs_check_inode_attributes(struct inode *inode, struct nfs_fattr *fat 
			invalid |= NFS_INO_INVALID_CHANGE

				| NFS_INO_REVAL_PAGECACHE;



		ts = timespec64_to_timespec(inode->i_mtime);

		if ((fattr->valid & NFS_ATTR_FATTR_MTIME) && !timespec_equal(&ts, &fattr->mtime))

		ts = inode->i_mtime;

		if ((fattr->valid & NFS_ATTR_FATTR_MTIME) && !timespec64_equal(&ts, &fattr->mtime))

			invalid |= NFS_INO_INVALID_MTIME;



		ts = timespec64_to_timespec(inode->i_ctime);

		if ((fattr->valid & NFS_ATTR_FATTR_CTIME) && !timespec_equal(&ts, &fattr->ctime))

		ts = inode->i_ctime;

		if ((fattr->valid & NFS_ATTR_FATTR_CTIME) && !timespec64_equal(&ts, &fattr->ctime))

			invalid |= NFS_INO_INVALID_CTIME;



		if (fattr->valid & NFS_ATTR_FATTR_SIZE) {
@@ -1460,8 +1460,8 @@ static int nfs_check_inode_attributes(struct inode *inode, struct nfs_fattr *fat 
	if ((fattr->valid & NFS_ATTR_FATTR_NLINK) && inode->i_nlink != fattr->nlink)

		invalid |= NFS_INO_INVALID_OTHER;



	ts = timespec64_to_timespec(inode->i_atime);

	if ((fattr->valid & NFS_ATTR_FATTR_ATIME) && !timespec_equal(&ts, &fattr->atime))

	ts = inode->i_atime;

	if ((fattr->valid & NFS_ATTR_FATTR_ATIME) && !timespec64_equal(&ts, &fattr->atime))

		invalid |= NFS_INO_INVALID_ATIME;



	if (invalid != 0)
@@ -1733,12 +1733,12 @@ int nfs_post_op_update_inode_force_wcc_locked(struct inode *inode, struct nfs_fa 
	}

	if ((fattr->valid & NFS_ATTR_FATTR_CTIME) != 0 &&

			(fattr->valid & NFS_ATTR_FATTR_PRECTIME) == 0) {

		fattr->pre_ctime = timespec64_to_timespec(inode->i_ctime);

		fattr->pre_ctime = inode->i_ctime;

		fattr->valid |= NFS_ATTR_FATTR_PRECTIME;

	}

	if ((fattr->valid & NFS_ATTR_FATTR_MTIME) != 0 &&

			(fattr->valid & NFS_ATTR_FATTR_PREMTIME) == 0) {

		fattr->pre_mtime = timespec64_to_timespec(inode->i_mtime);

		fattr->pre_mtime = inode->i_mtime;

		fattr->valid |= NFS_ATTR_FATTR_PREMTIME;

	}

	if ((fattr->valid & NFS_ATTR_FATTR_SIZE) != 0 &&
@@ -1899,7 +1899,7 @@ static int nfs_update_inode(struct inode *inode, struct nfs_fattr *fattr) 
	}



	if (fattr->valid & NFS_ATTR_FATTR_MTIME) {

		inode->i_mtime = timespec_to_timespec64(fattr->mtime);

		inode->i_mtime = fattr->mtime;

	} else if (server->caps & NFS_CAP_MTIME) {

		nfsi->cache_validity |= save_cache_validity &

				(NFS_INO_INVALID_MTIME
@@ -1908,7 +1908,7 @@ static int nfs_update_inode(struct inode *inode, struct nfs_fattr *fattr) 
	}



	if (fattr->valid & NFS_ATTR_FATTR_CTIME) {

		inode->i_ctime = timespec_to_timespec64(fattr->ctime);

		inode->i_ctime = fattr->ctime;

	} else if (server->caps & NFS_CAP_CTIME) {

		nfsi->cache_validity |= save_cache_validity &

				(NFS_INO_INVALID_CTIME
@@ -1946,7 +1946,7 @@ static int nfs_update_inode(struct inode *inode, struct nfs_fattr *fattr) 




	if (fattr->valid & NFS_ATTR_FATTR_ATIME)

		inode->i_atime = timespec_to_timespec64(fattr->atime);

		inode->i_atime = fattr->atime;

	else if (server->caps & NFS_CAP_ATIME) {

		nfsi->cache_validity |= save_cache_validity &

				(NFS_INO_INVALID_ATIME

fs/nfs/internal.h

+1 −1
Original line number Diff line number Diff line
@@ -713,7 +713,7 @@ unsigned int nfs_page_array_len(unsigned int base, size_t len) 
 * 1024*1024*1024.

 */

static inline

u64 nfs_timespec_to_change_attr(const struct timespec *ts)

u64 nfs_timespec_to_change_attr(const struct timespec64 *ts)

{

	return ((u64)ts->tv_sec << 30) + ts->tv_nsec;

}

fs/nfs/nfs2xdr.c

+1 −1
Original line number Diff line number Diff line
@@ -234,7 +234,7 @@ static __be32 *xdr_encode_current_server_time(__be32 *p, 
	return p;

}



static __be32 *xdr_decode_time(__be32 *p, struct timespec *timep)

static __be32 *xdr_decode_time(__be32 *p, struct timespec64 *timep)

{

	timep->tv_sec = be32_to_cpup(p++);

	timep->tv_nsec = be32_to_cpup(p++) * NSEC_PER_USEC;

fs/nfs/nfs3xdr.c

+1 −1
Original line number Diff line number Diff line
@@ -463,7 +463,7 @@ static __be32 *xdr_encode_nfstime3(__be32 *p, const struct timespec *timep) 
	return p;

}



static __be32 *xdr_decode_nfstime3(__be32 *p, struct timespec *timep)

static __be32 *xdr_decode_nfstime3(__be32 *p, struct timespec64 *timep)

{

	timep->tv_sec = be32_to_cpup(p++);

	timep->tv_nsec = be32_to_cpup(p++);

fs/nfs/nfs4xdr.c

+7 −7
Original line number Diff line number Diff line
@@ -4065,17 +4065,17 @@ static int decode_attr_space_used(struct xdr_stream *xdr, uint32_t *bitmap, uint 
}



static __be32 *

xdr_decode_nfstime4(__be32 *p, struct timespec *t)

xdr_decode_nfstime4(__be32 *p, struct timespec64 *t)

{

	__u64 sec;



	p = xdr_decode_hyper(p, &sec);

	t-> tv_sec = (time_t)sec;

	t-> tv_sec = sec;

	t->tv_nsec = be32_to_cpup(p++);

	return p;

}



static int decode_attr_time(struct xdr_stream *xdr, struct timespec *time)

static int decode_attr_time(struct xdr_stream *xdr, struct timespec64 *time)

{

	__be32 *p;
@@ -4086,7 +4086,7 @@ static int decode_attr_time(struct xdr_stream *xdr, struct timespec *time) 
	return 0;

}



static int decode_attr_time_access(struct xdr_stream *xdr, uint32_t *bitmap, struct timespec *time)

static int decode_attr_time_access(struct xdr_stream *xdr, uint32_t *bitmap, struct timespec64 *time)

{

	int status = 0;
@@ -4104,7 +4104,7 @@ static int decode_attr_time_access(struct xdr_stream *xdr, uint32_t *bitmap, str 
	return status;

}



static int decode_attr_time_metadata(struct xdr_stream *xdr, uint32_t *bitmap, struct timespec *time)

static int decode_attr_time_metadata(struct xdr_stream *xdr, uint32_t *bitmap, struct timespec64 *time)

{

	int status = 0;
@@ -4123,7 +4123,7 @@ static int decode_attr_time_metadata(struct xdr_stream *xdr, uint32_t *bitmap, s 
}



static int decode_attr_time_delta(struct xdr_stream *xdr, uint32_t *bitmap,

				  struct timespec *time)

				  struct timespec64 *time)

{

	int status = 0;
@@ -4186,7 +4186,7 @@ static int decode_attr_security_label(struct xdr_stream *xdr, uint32_t *bitmap, 
	return status;

}



static int decode_attr_time_modify(struct xdr_stream *xdr, uint32_t *bitmap, struct timespec *time)

static int decode_attr_time_modify(struct xdr_stream *xdr, uint32_t *bitmap, struct timespec64 *time)

{

	int status = 0;