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

Commit 07119a4d authored by Jeff Layton's avatar Jeff Layton Committed by Steve French
Browse files

cifs: have cifs_NTtimeToUnix take a little-endian arg 



...and just have the function call le64_to_cpu.

Signed-off-by: default avatarJeff Layton <jlayton@redhat.com>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarSteve French <sfrench@us.ibm.com>
parent f55ed1a8

fs/cifs/cifsproto.h

+1 −1
Original line number Diff line number Diff line
@@ -90,7 +90,7 @@ extern struct oplock_q_entry *AllocOplockQEntry(struct inode *, u16, 
						 struct cifsTconInfo *);

extern void DeleteOplockQEntry(struct oplock_q_entry *);

extern void DeleteTconOplockQEntries(struct cifsTconInfo *);

extern struct timespec cifs_NTtimeToUnix(u64 utc_nanoseconds_since_1601);

extern struct timespec cifs_NTtimeToUnix(__le64 utc_nanoseconds_since_1601);

extern u64 cifs_UnixTimeToNT(struct timespec);

extern __le64 cnvrtDosCifsTm(__u16 date, __u16 time);

extern struct timespec cnvrtDosUnixTm(__u16 date, __u16 time);

fs/cifs/file.c

+1 −1
Original line number Diff line number Diff line
@@ -241,7 +241,7 @@ static inline int cifs_open_inode_helper(struct inode *inode, struct file *file, 
	/* BB need same check in cifs_create too? */

	/* if not oplocked, invalidate inode pages if mtime or file

	   size changed */

	temp = cifs_NTtimeToUnix(le64_to_cpu(buf->LastWriteTime));

	temp = cifs_NTtimeToUnix(buf->LastWriteTime);

	if (timespec_equal(&file->f_path.dentry->d_inode->i_mtime, &temp) &&

			   (file->f_path.dentry->d_inode->i_size ==

			    (loff_t)le64_to_cpu(buf->EndOfFile))) {

fs/cifs/inode.c

+6 −9
Original line number Diff line number Diff line
@@ -85,10 +85,10 @@ static void cifs_unix_info_to_inode(struct inode *inode, 
	__u64 num_of_bytes = le64_to_cpu(info->NumOfBytes);

	__u64 end_of_file = le64_to_cpu(info->EndOfFile);



	inode->i_atime = cifs_NTtimeToUnix(le64_to_cpu(info->LastAccessTime));

	inode->i_atime = cifs_NTtimeToUnix(info->LastAccessTime);

	inode->i_mtime =

		cifs_NTtimeToUnix(le64_to_cpu(info->LastModificationTime));

	inode->i_ctime = cifs_NTtimeToUnix(le64_to_cpu(info->LastStatusChange));

		cifs_NTtimeToUnix(info->LastModificationTime);

	inode->i_ctime = cifs_NTtimeToUnix(info->LastStatusChange);

	inode->i_mode = le64_to_cpu(info->Permissions);



	/*
@@ -554,14 +554,11 @@ int cifs_get_inode_info(struct inode **pinode, 


	/* Linux can not store file creation time so ignore it */

	if (pfindData->LastAccessTime)

		inode->i_atime = cifs_NTtimeToUnix

			(le64_to_cpu(pfindData->LastAccessTime));

		inode->i_atime = cifs_NTtimeToUnix(pfindData->LastAccessTime);

	else /* do not need to use current_fs_time - time not stored */

		inode->i_atime = CURRENT_TIME;

	inode->i_mtime =

		    cifs_NTtimeToUnix(le64_to_cpu(pfindData->LastWriteTime));

	inode->i_ctime =

	    cifs_NTtimeToUnix(le64_to_cpu(pfindData->ChangeTime));

	inode->i_mtime = cifs_NTtimeToUnix(pfindData->LastWriteTime);

	inode->i_ctime = cifs_NTtimeToUnix(pfindData->ChangeTime);

	cFYI(DBG2, ("Attributes came in as 0x%x", attr));

	if (adjustTZ && (pTcon->ses) && (pTcon->ses->server)) {

		inode->i_ctime.tv_sec += pTcon->ses->server->timeAdj;

fs/cifs/netmisc.c

+6 −6
Original line number Diff line number Diff line
@@ -858,7 +858,7 @@ smbCalcSize_LE(struct smb_hdr *ptr) 
 * into Unix UTC (based 1970-01-01, in seconds).

 */

struct timespec

cifs_NTtimeToUnix(u64 ntutc)

cifs_NTtimeToUnix(__le64 ntutc)

{

	struct timespec ts;

	/* BB what about the timezone? BB */
@@ -866,7 +866,7 @@ cifs_NTtimeToUnix(u64 ntutc) 
	/* Subtract the NTFS time offset, then convert to 1s intervals. */

	u64 t;



	t = ntutc - NTFS_TIME_OFFSET;

	t = le64_to_cpu(ntutc) - NTFS_TIME_OFFSET;

	ts.tv_nsec = do_div(t, 10000000) * 100;

	ts.tv_sec = t;

	return ts;

fs/cifs/readdir.c

+6 −6
Original line number Diff line number Diff line
@@ -150,11 +150,11 @@ static void fill_in_inode(struct inode *tmp_inode, int new_buf_type, 
		allocation_size = le64_to_cpu(pfindData->AllocationSize);

		end_of_file = le64_to_cpu(pfindData->EndOfFile);

		tmp_inode->i_atime =

		      cifs_NTtimeToUnix(le64_to_cpu(pfindData->LastAccessTime));

			cifs_NTtimeToUnix(pfindData->LastAccessTime);

		tmp_inode->i_mtime =

		      cifs_NTtimeToUnix(le64_to_cpu(pfindData->LastWriteTime));

			cifs_NTtimeToUnix(pfindData->LastWriteTime);

		tmp_inode->i_ctime =

		      cifs_NTtimeToUnix(le64_to_cpu(pfindData->ChangeTime));

			cifs_NTtimeToUnix(pfindData->ChangeTime);

	} else { /* legacy, OS2 and DOS style */

/*		struct timespec ts;*/

		FIND_FILE_STANDARD_INFO *pfindData =
@@ -331,11 +331,11 @@ static void unix_fill_in_inode(struct inode *tmp_inode, 
	local_size  = tmp_inode->i_size;



	tmp_inode->i_atime =

	    cifs_NTtimeToUnix(le64_to_cpu(pfindData->LastAccessTime));

	    cifs_NTtimeToUnix(pfindData->LastAccessTime);

	tmp_inode->i_mtime =

	    cifs_NTtimeToUnix(le64_to_cpu(pfindData->LastModificationTime));

	    cifs_NTtimeToUnix(pfindData->LastModificationTime);

	tmp_inode->i_ctime =

	    cifs_NTtimeToUnix(le64_to_cpu(pfindData->LastStatusChange));

	    cifs_NTtimeToUnix(pfindData->LastStatusChange);



	tmp_inode->i_mode = le64_to_cpu(pfindData->Permissions);

	/* since we set the inode type below we need to mask off type