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

Commit cc56c33e authored by Jeff Layton's avatar Jeff Layton
Browse files

ocfs2: convert to new i_version API 



Signed-off-by: default avatarJeff Layton <jlayton@redhat.com>
Reviewed-by: default avatarJan Kara <jack@suse.cz>
parent 1f15a550

fs/ocfs2/dir.c

+8 −7
Original line number Original line Diff line number Diff line
@@ -42,6 +42,7 @@ 
#include <linux/highmem.h>

#include <linux/highmem.h>

#include <linux/quotaops.h>

#include <linux/quotaops.h>

#include <linux/sort.h>

#include <linux/sort.h>

#include <linux/iversion.h>





#include <cluster/masklog.h>

#include <cluster/masklog.h>
@@ -1174,7 +1175,7 @@ static int __ocfs2_delete_entry(handle_t *handle, struct inode *dir, 
				le16_add_cpu(&pde->rec_len,

				le16_add_cpu(&pde->rec_len,

						le16_to_cpu(de->rec_len));

						le16_to_cpu(de->rec_len));

			de->inode = 0;

			de->inode = 0;

			dir->i_version++;

			inode_inc_iversion(dir);

			ocfs2_journal_dirty(handle, bh);

			ocfs2_journal_dirty(handle, bh);

			goto bail;

			goto bail;

		}

		}
@@ -1729,7 +1730,7 @@ int __ocfs2_add_entry(handle_t *handle, 
			if (ocfs2_dir_indexed(dir))

			if (ocfs2_dir_indexed(dir))

				ocfs2_recalc_free_list(dir, handle, lookup);

				ocfs2_recalc_free_list(dir, handle, lookup);





			dir->i_version++;

			inode_inc_iversion(dir);

			ocfs2_journal_dirty(handle, insert_bh);

			ocfs2_journal_dirty(handle, insert_bh);

			retval = 0;

			retval = 0;

			goto bail;

			goto bail;
@@ -1775,7 +1776,7 @@ static int ocfs2_dir_foreach_blk_id(struct inode *inode, 
		 * readdir(2), then we might be pointing to an invalid

		 * readdir(2), then we might be pointing to an invalid

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

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

		 * to make sure. */

		 * to make sure. */

		if (*f_version != inode->i_version) {

		if (inode_cmp_iversion(inode, *f_version)) {

			for (i = 0; i < i_size_read(inode) && i < offset; ) {

			for (i = 0; i < i_size_read(inode) && i < offset; ) {

				de = (struct ocfs2_dir_entry *)

				de = (struct ocfs2_dir_entry *)

					(data->id_data + i);

					(data->id_data + i);
@@ -1791,7 +1792,7 @@ static int ocfs2_dir_foreach_blk_id(struct inode *inode, 
				i += le16_to_cpu(de->rec_len);

				i += le16_to_cpu(de->rec_len);

			}

			}

			ctx->pos = offset = i;

			ctx->pos = offset = i;

			*f_version = inode->i_version;

			*f_version = inode_query_iversion(inode);

		}

		}





		de = (struct ocfs2_dir_entry *) (data->id_data + ctx->pos);

		de = (struct ocfs2_dir_entry *) (data->id_data + ctx->pos);
@@ -1869,7 +1870,7 @@ static int ocfs2_dir_foreach_blk_el(struct inode *inode, 
		 * readdir(2), then we might be pointing to an invalid

		 * readdir(2), then we might be pointing to an invalid

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

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

		 * to make sure. */

		 * to make sure. */

		if (*f_version != inode->i_version) {

		if (inode_cmp_iversion(inode, *f_version)) {

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

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

				de = (struct ocfs2_dir_entry *) (bh->b_data + i);

				de = (struct ocfs2_dir_entry *) (bh->b_data + i);

				/* It's too expensive to do a full

				/* It's too expensive to do a full
@@ -1886,7 +1887,7 @@ static int ocfs2_dir_foreach_blk_el(struct inode *inode, 
			offset = i;

			offset = i;

			ctx->pos = (ctx->pos & ~(sb->s_blocksize - 1))

			ctx->pos = (ctx->pos & ~(sb->s_blocksize - 1))

				| offset;

				| offset;

			*f_version = inode->i_version;

			*f_version = inode_query_iversion(inode);

		}

		}





		while (ctx->pos < i_size_read(inode)

		while (ctx->pos < i_size_read(inode)
@@ -1940,7 +1941,7 @@ static int ocfs2_dir_foreach_blk(struct inode *inode, u64 *f_version, 
 */

 */

int ocfs2_dir_foreach(struct inode *inode, struct dir_context *ctx)

int ocfs2_dir_foreach(struct inode *inode, struct dir_context *ctx)

{

{

	u64 version = inode->i_version;

	u64 version = inode_query_iversion(inode);

	ocfs2_dir_foreach_blk(inode, &version, ctx, true);

	ocfs2_dir_foreach_blk(inode, &version, ctx, true);

	return 0;

	return 0;

}

}

fs/ocfs2/inode.c

+2 −1
Original line number Original line Diff line number Diff line
@@ -28,6 +28,7 @@ 
#include <linux/highmem.h>

#include <linux/highmem.h>

#include <linux/pagemap.h>

#include <linux/pagemap.h>

#include <linux/quotaops.h>

#include <linux/quotaops.h>

#include <linux/iversion.h>





#include <asm/byteorder.h>

#include <asm/byteorder.h>
@@ -302,7 +303,7 @@ void ocfs2_populate_inode(struct inode *inode, struct ocfs2_dinode *fe, 
	OCFS2_I(inode)->ip_attr = le32_to_cpu(fe->i_attr);

	OCFS2_I(inode)->ip_attr = le32_to_cpu(fe->i_attr);

	OCFS2_I(inode)->ip_dyn_features = le16_to_cpu(fe->i_dyn_features);

	OCFS2_I(inode)->ip_dyn_features = le16_to_cpu(fe->i_dyn_features);





	inode->i_version = 1;

	inode_set_iversion(inode, 1);

	inode->i_generation = le32_to_cpu(fe->i_generation);

	inode->i_generation = le32_to_cpu(fe->i_generation);

	inode->i_rdev = huge_decode_dev(le64_to_cpu(fe->id1.dev1.i_rdev));

	inode->i_rdev = huge_decode_dev(le64_to_cpu(fe->id1.dev1.i_rdev));

	inode->i_mode = le16_to_cpu(fe->i_mode);

	inode->i_mode = le16_to_cpu(fe->i_mode);

fs/ocfs2/namei.c

+2 −1
Original line number Original line Diff line number Diff line
@@ -41,6 +41,7 @@ 
#include <linux/slab.h>

#include <linux/slab.h>

#include <linux/highmem.h>

#include <linux/highmem.h>

#include <linux/quotaops.h>

#include <linux/quotaops.h>

#include <linux/iversion.h>





#include <cluster/masklog.h>

#include <cluster/masklog.h>
@@ -1520,7 +1521,7 @@ static int ocfs2_rename(struct inode *old_dir, 
			mlog_errno(status);

			mlog_errno(status);

			goto bail;

			goto bail;

		}

		}

		new_dir->i_version++;

		inode_inc_iversion(new_dir);





		if (S_ISDIR(new_inode->i_mode))

		if (S_ISDIR(new_inode->i_mode))

			ocfs2_set_links_count(newfe, 0);

			ocfs2_set_links_count(newfe, 0);

fs/ocfs2/quota_global.c

+2 −1
Original line number Original line Diff line number Diff line
@@ -12,6 +12,7 @@ 
#include <linux/writeback.h>

#include <linux/writeback.h>

#include <linux/workqueue.h>

#include <linux/workqueue.h>

#include <linux/llist.h>

#include <linux/llist.h>

#include <linux/iversion.h>





#include <cluster/masklog.h>

#include <cluster/masklog.h>
@@ -289,7 +290,7 @@ ssize_t ocfs2_quota_write(struct super_block *sb, int type, 
		mlog_errno(err);

		mlog_errno(err);

		return err;

		return err;

	}

	}

	gqinode->i_version++;

	inode_inc_iversion(gqinode);

	ocfs2_mark_inode_dirty(handle, gqinode, oinfo->dqi_gqi_bh);

	ocfs2_mark_inode_dirty(handle, gqinode, oinfo->dqi_gqi_bh);

	return len;

	return len;

}

}