Commit 14ab6d42 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'vfs-6.7.ctime' of gitolite.kernel.org:pub/scm/linux/kernel/git/vfs/vfs 

Pull vfs inode time accessor updates from Christian Brauner:
 "This finishes the conversion of all inode time fields to accessor
  functions as discussed on list. Changing timestamps manually as we
  used to do before is error prone. Using accessors function makes this
  robust.

  It does not contain the switch of the time fields to discrete 64 bit
  integers to replace struct timespec and free up space in struct inode.
  But after this, the switch can be trivially made and the patch should
  only affect the vfs if we decide to do it"

* tag 'vfs-6.7.ctime' of gitolite.kernel.org:pub/scm/linux/kernel/git/vfs/vfs: (86 commits)
  fs: rename inode i_atime and i_mtime fields
  security: convert to new timestamp accessors
  selinux: convert to new timestamp accessors
  apparmor: convert to new timestamp accessors
  sunrpc: convert to new timestamp accessors
  mm: convert to new timestamp accessors
  bpf: convert to new timestamp accessors
  ipc: convert to new timestamp accessors
  linux: convert to new timestamp accessors
  zonefs: convert to new timestamp accessors
  xfs: convert to new timestamp accessors
  vboxsf: convert to new timestamp accessors
  ufs: convert to new timestamp accessors
  udf: convert to new timestamp accessors
  ubifs: convert to new timestamp accessors
  tracefs: convert to new timestamp accessors
  sysv: convert to new timestamp accessors
  squashfs: convert to new timestamp accessors
  server: convert to new timestamp accessors
  client: convert to new timestamp accessors
  ...
parents 7352a676 12cd4402

arch/powerpc/platforms/cell/spufs/inode.c

+1 −1
Original line number Diff line number Diff line
@@ -86,7 +86,7 @@ spufs_new_inode(struct super_block *sb, umode_t mode) 
	inode->i_mode = mode;

	inode->i_uid = current_fsuid();

	inode->i_gid = current_fsgid();

	inode->i_atime = inode->i_mtime = inode_set_ctime_current(inode);

	simple_inode_init_ts(inode);

out:

	return inode;

}

arch/s390/hypfs/inode.c

+2 −2
Original line number Diff line number Diff line
@@ -53,7 +53,7 @@ static void hypfs_update_update(struct super_block *sb) 
	struct inode *inode = d_inode(sb_info->update_file);



	sb_info->last_update = ktime_get_seconds();

	inode->i_atime = inode->i_mtime = inode_set_ctime_current(inode);

	simple_inode_init_ts(inode);

}



/* directory tree removal functions */
@@ -101,7 +101,7 @@ static struct inode *hypfs_make_inode(struct super_block *sb, umode_t mode) 
		ret->i_mode = mode;

		ret->i_uid = hypfs_info->uid;

		ret->i_gid = hypfs_info->gid;

		ret->i_atime = ret->i_mtime = inode_set_ctime_current(ret);

		simple_inode_init_ts(ret);

		if (S_ISDIR(mode))

			set_nlink(ret, 2);

	}

drivers/android/binderfs.c

+4 −4
Original line number Diff line number Diff line
@@ -152,7 +152,7 @@ static int binderfs_binder_device_create(struct inode *ref_inode, 
		goto err;



	inode->i_ino = minor + INODE_OFFSET;

	inode->i_mtime = inode->i_atime = inode_set_ctime_current(inode);

	simple_inode_init_ts(inode);

	init_special_inode(inode, S_IFCHR | 0600,

			   MKDEV(MAJOR(binderfs_dev), minor));

	inode->i_fop = &binder_fops;
@@ -431,7 +431,7 @@ static int binderfs_binder_ctl_create(struct super_block *sb) 
	}



	inode->i_ino = SECOND_INODE;

	inode->i_mtime = inode->i_atime = inode_set_ctime_current(inode);

	simple_inode_init_ts(inode);

	init_special_inode(inode, S_IFCHR | 0600,

			   MKDEV(MAJOR(binderfs_dev), minor));

	inode->i_fop = &binder_ctl_fops;
@@ -473,7 +473,7 @@ static struct inode *binderfs_make_inode(struct super_block *sb, int mode) 
	if (ret) {

		ret->i_ino = iunique(sb, BINDERFS_MAX_MINOR + INODE_OFFSET);

		ret->i_mode = mode;

		ret->i_atime = ret->i_mtime = inode_set_ctime_current(ret);

		simple_inode_init_ts(ret);

	}

	return ret;

}
@@ -702,7 +702,7 @@ static int binderfs_fill_super(struct super_block *sb, struct fs_context *fc) 
	inode->i_ino = FIRST_INODE;

	inode->i_fop = &simple_dir_operations;

	inode->i_mode = S_IFDIR | 0755;

	inode->i_mtime = inode->i_atime = inode_set_ctime_current(inode);

	simple_inode_init_ts(inode);

	inode->i_op = &binderfs_dir_inode_operations;

	set_nlink(inode, 2);

drivers/char/sonypi.c

+1 −1
Original line number Diff line number Diff line
@@ -920,7 +920,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_time(inode);

		inode_set_atime_to_ts(inode, current_time(inode));

	}



	return ret;

drivers/infiniband/hw/qib/qib_fs.c

+2 −2
Original line number Diff line number Diff line
@@ -64,8 +64,8 @@ static int qibfs_mknod(struct inode *dir, struct dentry *dentry, 
	inode->i_uid = GLOBAL_ROOT_UID;

	inode->i_gid = GLOBAL_ROOT_GID;

	inode->i_blocks = 0;

	inode->i_atime = inode_set_ctime_current(inode);

	inode->i_mtime = inode->i_atime;

	simple_inode_init_ts(inode);

	

	inode->i_private = data;

	if (S_ISDIR(mode)) {

		inode->i_op = &simple_dir_inode_operations;