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

Commit 15eefe2a authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge branch 'vfs_timespec64' of https://github.com/deepa-hub/vfs into vfs-timespec64 



Pull the timespec64 conversion from Deepa Dinamani:
 "The series aims to switch vfs timestamps to use
  struct timespec64. Currently vfs uses struct timespec,
  which is not y2038 safe.

  The flag patch applies cleanly. I've not seen the timestamps
  update logic change often. The series applies cleanly on 4.17-rc6
  and linux-next tip (top commit: next-20180517).

  I'm not sure how to merge this kind of a series with a flag patch.
  We are targeting 4.18 for this.
  Let me know if you have other suggestions.

  The series involves the following:
  1. Add vfs helper functions for supporting struct timepec64 timestamps.
  2. Cast prints of vfs timestamps to avoid warnings after the switch.
  3. Simplify code using vfs timestamps so that the actual
     replacement becomes easy.
  4. Convert vfs timestamps to use struct timespec64 using a script.
     This is a flag day patch.

  I've tried to keep the conversions with the script simple, to
  aid in the reviews. I've kept all the internal filesystem data
  structures and function signatures the same.

  Next steps:
  1. Convert APIs that can handle timespec64, instead of converting
     timestamps at the boundaries.
  2. Update internal data structures to avoid timestamp conversions."

I've pulled it into a branch based on top of the NFS changes that
are now in mainline, so I could resolve the non-obvious conflict
between the two while merging.

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 93b7f7ad 95582b00

drivers/firmware/efi/efi-pstore.c

+14 −13
Original line number Diff line number Diff line
@@ -28,10 +28,9 @@ static int efi_pstore_close(struct pstore_info *psi) 
	return 0;

}



static inline u64 generic_id(unsigned long timestamp,

			     unsigned int part, int count)

static inline u64 generic_id(u64 timestamp, unsigned int part, int count)

{

	return ((u64) timestamp * 100 + part) * 1000 + count;

	return (timestamp * 100 + part) * 1000 + count;

}



static int efi_pstore_read_func(struct efivar_entry *entry,
@@ -42,7 +41,8 @@ static int efi_pstore_read_func(struct efivar_entry *entry, 
	int i;

	int cnt;

	unsigned int part;

	unsigned long time, size;

	unsigned long size;

	u64 time;



	if (efi_guidcmp(entry->var.VendorGuid, vendor))

		return 0;
@@ -50,7 +50,7 @@ static int efi_pstore_read_func(struct efivar_entry *entry, 
	for (i = 0; i < DUMP_NAME_LEN; i++)

		name[i] = entry->var.VariableName[i];



	if (sscanf(name, "dump-type%u-%u-%d-%lu-%c",

	if (sscanf(name, "dump-type%u-%u-%d-%llu-%c",

		   &record->type, &part, &cnt, &time, &data_type) == 5) {

		record->id = generic_id(time, part, cnt);

		record->part = part;
@@ -62,7 +62,7 @@ static int efi_pstore_read_func(struct efivar_entry *entry, 
		else

			record->compressed = false;

		record->ecc_notice_size = 0;

	} else if (sscanf(name, "dump-type%u-%u-%d-%lu",

	} else if (sscanf(name, "dump-type%u-%u-%d-%llu",

		   &record->type, &part, &cnt, &time) == 4) {

		record->id = generic_id(time, part, cnt);

		record->part = part;
@@ -71,7 +71,7 @@ static int efi_pstore_read_func(struct efivar_entry *entry, 
		record->time.tv_nsec = 0;

		record->compressed = false;

		record->ecc_notice_size = 0;

	} else if (sscanf(name, "dump-type%u-%u-%lu",

	} else if (sscanf(name, "dump-type%u-%u-%llu",

			  &record->type, &part, &time) == 3) {

		/*

		 * Check if an old format,
@@ -250,9 +250,10 @@ static int efi_pstore_write(struct pstore_record *record) 
	/* Since we copy the entire length of name, make sure it is wiped. */

	memset(name, 0, sizeof(name));



	snprintf(name, sizeof(name), "dump-type%u-%u-%d-%lu-%c",

	snprintf(name, sizeof(name), "dump-type%u-%u-%d-%lld-%c",

		 record->type, record->part, record->count,

		 record->time.tv_sec, record->compressed ? 'C' : 'D');

		 (long long)record->time.tv_sec,

		 record->compressed ? 'C' : 'D');



	for (i = 0; i < DUMP_NAME_LEN; i++)

		efi_name[i] = name[i];
@@ -327,15 +328,15 @@ static int efi_pstore_erase(struct pstore_record *record) 
	char name[DUMP_NAME_LEN];

	int ret;



	snprintf(name, sizeof(name), "dump-type%u-%u-%d-%lu",

	snprintf(name, sizeof(name), "dump-type%u-%u-%d-%lld",

		 record->type, record->part, record->count,

		 record->time.tv_sec);

		 (long long)record->time.tv_sec);

	ret = efi_pstore_erase_name(name);

	if (ret != -ENOENT)

		return ret;



	snprintf(name, sizeof(name), "dump-type%u-%u-%lu",

		record->type, record->part, record->time.tv_sec);

	snprintf(name, sizeof(name), "dump-type%u-%u-%lld",

		record->type, record->part, (long long)record->time.tv_sec);

	ret = efi_pstore_erase_name(name);



	return ret;

drivers/staging/lustre/lustre/llite/llite_lib.c

+7 −5
Original line number Diff line number Diff line
@@ -1482,8 +1482,9 @@ int ll_setattr_raw(struct dentry *dentry, struct iattr *attr, bool hsm_import) 
	}



	if (attr->ia_valid & (ATTR_MTIME | ATTR_CTIME))

		CDEBUG(D_INODE, "setting mtime %lu, ctime %lu, now = %llu\n",

		       LTIME_S(attr->ia_mtime), LTIME_S(attr->ia_ctime),

		CDEBUG(D_INODE, "setting mtime %llu, ctime %llu, now = %llu\n",

		       (unsigned long long)LTIME_S(attr->ia_mtime),

		       (unsigned long long)LTIME_S(attr->ia_ctime),

		       (s64)ktime_get_real_seconds());



	if (S_ISREG(inode->i_mode))
@@ -1760,9 +1761,10 @@ int ll_update_inode(struct inode *inode, struct lustre_md *md) 
	if (body->mbo_valid & OBD_MD_FLMTIME) {

		if (body->mbo_mtime > LTIME_S(inode->i_mtime)) {

			CDEBUG(D_INODE,

			       "setting ino %lu mtime from %lu to %llu\n",

			       inode->i_ino, LTIME_S(inode->i_mtime),

			       body->mbo_mtime);

			       "setting ino %lu mtime from %llu to %llu\n",

			       inode->i_ino,

			       (unsigned long long)LTIME_S(inode->i_mtime),

			       (unsigned long long)body->mbo_mtime);

			LTIME_S(inode->i_mtime) = body->mbo_mtime;

		}

		lli->lli_mtime = body->mbo_mtime;

drivers/staging/lustre/lustre/llite/namei.c

+3 −2
Original line number Diff line number Diff line
@@ -844,8 +844,9 @@ void ll_update_times(struct ptlrpc_request *request, struct inode *inode) 
	LASSERT(body);

	if (body->mbo_valid & OBD_MD_FLMTIME &&

	    body->mbo_mtime > LTIME_S(inode->i_mtime)) {

		CDEBUG(D_INODE, "setting fid " DFID " mtime from %lu to %llu\n",

		       PFID(ll_inode2fid(inode)), LTIME_S(inode->i_mtime),

		CDEBUG(D_INODE, "setting fid " DFID " mtime from %llu to %llu\n",

		       PFID(ll_inode2fid(inode)),

		       (unsigned long long)LTIME_S(inode->i_mtime),

		       body->mbo_mtime);

		LTIME_S(inode->i_mtime) = body->mbo_mtime;

	}

drivers/staging/lustre/lustre/lmv/lmv_obd.c

+4 −3
Original line number Diff line number Diff line
@@ -3031,11 +3031,12 @@ static int lmv_merge_attr(struct obd_export *exp, 
	for (i = 0; i < lsm->lsm_md_stripe_count; i++) {

		struct inode *inode = lsm->lsm_md_oinfo[i].lmo_root;



		CDEBUG(D_INFO, "" DFID " size %llu, blocks %llu nlink %u, atime %lu ctime %lu, mtime %lu.\n",

		CDEBUG(D_INFO, "" DFID " size %llu, blocks %llu nlink %u, atime %llu ctime %llu, mtime %llu.\n",

		       PFID(&lsm->lsm_md_oinfo[i].lmo_fid),

		       i_size_read(inode), (unsigned long long)inode->i_blocks,

		       inode->i_nlink, LTIME_S(inode->i_atime),

		       LTIME_S(inode->i_ctime), LTIME_S(inode->i_mtime));

		       inode->i_nlink, (unsigned long long)LTIME_S(inode->i_atime),

		       (unsigned long long)LTIME_S(inode->i_ctime),

		       (unsigned long long)LTIME_S(inode->i_mtime));



		/* for slave stripe, it needs to subtract nlink for . and .. */

		if (i)

drivers/staging/lustre/lustre/mdc/mdc_reint.c

+3 −3
Original line number Diff line number Diff line
@@ -129,9 +129,9 @@ int mdc_setattr(struct obd_export *exp, struct md_op_data *op_data, 
	}



	if (op_data->op_attr.ia_valid & (ATTR_MTIME | ATTR_CTIME))

		CDEBUG(D_INODE, "setting mtime %ld, ctime %ld\n",

		       LTIME_S(op_data->op_attr.ia_mtime),

		       LTIME_S(op_data->op_attr.ia_ctime));

		CDEBUG(D_INODE, "setting mtime %lld, ctime %lld\n",

		       (long long)LTIME_S(op_data->op_attr.ia_mtime),

		       (long long)LTIME_S(op_data->op_attr.ia_ctime));

	mdc_setattr_pack(req, op_data, ea, ealen);



	ptlrpc_request_set_replen(req);