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

Commit 6fbac201 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'iversion-v4.16-2' of git://git.kernel.org/pub/scm/linux/kernel/git/jlayton/linux 

Pull inode->i_version cleanup from Jeff Layton:
 "Goffredo went ahead and sent a patch to rename this function, and
  reverse its sense, as we discussed last week.

  The patch is very straightforward and I figure it's probably best to
  go ahead and merge this to get the API as settled as possible"

* tag 'iversion-v4.16-2' of git://git.kernel.org/pub/scm/linux/kernel/git/jlayton/linux:
  iversion: Rename make inode_cmp_iversion{+raw} to inode_eq_iversion{+raw}
parents fe803f86 c472c07b

fs/affs/dir.c

+1 −1
Original line number Diff line number Diff line
@@ -81,7 +81,7 @@ affs_readdir(struct file *file, struct dir_context *ctx) 
	 * we can jump directly to where we left off.

	 */

	ino = (u32)(long)file->private_data;

	if (ino && inode_cmp_iversion(inode, file->f_version) == 0) {

	if (ino && inode_eq_iversion(inode, file->f_version)) {

		pr_debug("readdir() left off=%d\n", ino);

		goto inside;

	}

fs/exofs/dir.c

+1 −1
Original line number Diff line number Diff line
@@ -242,7 +242,7 @@ exofs_readdir(struct file *file, struct dir_context *ctx) 
	unsigned long n = pos >> PAGE_SHIFT;

	unsigned long npages = dir_pages(inode);

	unsigned chunk_mask = ~(exofs_chunk_size(inode)-1);

	bool need_revalidate = inode_cmp_iversion(inode, file->f_version);

	bool need_revalidate = !inode_eq_iversion(inode, file->f_version);



	if (pos > inode->i_size - EXOFS_DIR_REC_LEN(1))

		return 0;

fs/ext2/dir.c

+1 −1
Original line number Diff line number Diff line
@@ -294,7 +294,7 @@ ext2_readdir(struct file *file, struct dir_context *ctx) 
	unsigned long npages = dir_pages(inode);

	unsigned chunk_mask = ~(ext2_chunk_size(inode)-1);

	unsigned char *types = NULL;

	bool need_revalidate = inode_cmp_iversion(inode, file->f_version);

	bool need_revalidate = !inode_eq_iversion(inode, file->f_version);



	if (pos > inode->i_size - EXT2_DIR_REC_LEN(1))

		return 0;

fs/ext4/dir.c

+2 −2
Original line number Diff line number Diff line
@@ -209,7 +209,7 @@ static int ext4_readdir(struct file *file, struct dir_context *ctx) 
		 * readdir(2), then we might be pointing to an invalid

		 * dirent right now.  Scan from the start of the block

		 * to make sure. */

		if (inode_cmp_iversion(inode, file->f_version)) {

		if (!inode_eq_iversion(inode, file->f_version)) {

			for (i = 0; i < sb->s_blocksize && i < offset; ) {

				de = (struct ext4_dir_entry_2 *)

					(bh->b_data + i);
@@ -569,7 +569,7 @@ static int ext4_dx_readdir(struct file *file, struct dir_context *ctx) 
		 * cached entries.

		 */

		if ((!info->curr_node) ||

		    inode_cmp_iversion(inode, file->f_version)) {

		    !inode_eq_iversion(inode, file->f_version)) {

			info->curr_node = NULL;

			free_rb_tree_fname(&info->root);

			file->f_version = inode_query_iversion(inode);

fs/ext4/inline.c

+1 −1
Original line number Diff line number Diff line
@@ -1487,7 +1487,7 @@ int ext4_read_inline_dir(struct file *file, 
	 * dirent right now.  Scan from the start of the inline

	 * dir to make sure.

	 */

	if (inode_cmp_iversion(inode, file->f_version)) {

	if (!inode_eq_iversion(inode, file->f_version)) {

		for (i = 0; i < extra_size && i < offset;) {

			/*

			 * "." is with offset 0 and