[PATCH] ext2: switch to inode_inc_count, inode_dec_count (a513b035) · Commits · jan.koester / Linux

fs/ext2/namei.c

+19 −35

Original line number	Original line	Diff line number	Diff line
	@@ -36,22 +36,6 @@
	#include "acl.h"		#include "acl.h"
	#include "xip.h"		#include "xip.h"

	/*
	* Couple of helper functions - make the code slightly cleaner.
	*/

	static inline void ext2_inc_count(struct inode *inode)
	{
	inode->i_nlink++;
	mark_inode_dirty(inode);
	}

	static inline void ext2_dec_count(struct inode *inode)
	{
	inode->i_nlink--;
	mark_inode_dirty(inode);
	}

	static inline int ext2_add_nondir(struct dentry dentry, struct inode inode)		static inline int ext2_add_nondir(struct dentry dentry, struct inode inode)
	{		{
	int err = ext2_add_link(dentry, inode);		int err = ext2_add_link(dentry, inode);
	@@ -59,7 +43,7 @@ static inline int ext2_add_nondir(struct dentry dentry, struct inode inode)
	d_instantiate(dentry, inode);		d_instantiate(dentry, inode);
	return 0;		return 0;
	}		}
	ext2_dec_count(inode);		inode_dec_link_count(inode);
	iput(inode);		iput(inode);
	return err;		return err;
	}		}
	@@ -201,7 +185,7 @@ static int ext2_symlink (struct inode * dir, struct dentry * dentry,
	return err;		return err;

	out_fail:		out_fail:
	ext2_dec_count(inode);		inode_dec_link_count(inode);
	iput (inode);		iput (inode);
	goto out;		goto out;
	}		}
	@@ -215,7 +199,7 @@ static int ext2_link (struct dentry * old_dentry, struct inode * dir,
	return -EMLINK;		return -EMLINK;

	inode->i_ctime = CURRENT_TIME_SEC;		inode->i_ctime = CURRENT_TIME_SEC;
	ext2_inc_count(inode);		inode_inc_link_count(inode);
	atomic_inc(&inode->i_count);		atomic_inc(&inode->i_count);

	return ext2_add_nondir(dentry, inode);		return ext2_add_nondir(dentry, inode);
	@@ -229,7 +213,7 @@ static int ext2_mkdir(struct inode * dir, struct dentry * dentry, int mode)
	if (dir->i_nlink >= EXT2_LINK_MAX)		if (dir->i_nlink >= EXT2_LINK_MAX)
	goto out;		goto out;

	ext2_inc_count(dir);		inode_inc_link_count(dir);

	inode = ext2_new_inode (dir, S_IFDIR \| mode);		inode = ext2_new_inode (dir, S_IFDIR \| mode);
	err = PTR_ERR(inode);		err = PTR_ERR(inode);
	@@ -243,7 +227,7 @@ static int ext2_mkdir(struct inode * dir, struct dentry * dentry, int mode)
	else		else
	inode->i_mapping->a_ops = &ext2_aops;		inode->i_mapping->a_ops = &ext2_aops;

	ext2_inc_count(inode);		inode_inc_link_count(inode);

	err = ext2_make_empty(inode, dir);		err = ext2_make_empty(inode, dir);
	if (err)		if (err)
	@@ -258,11 +242,11 @@ static int ext2_mkdir(struct inode * dir, struct dentry * dentry, int mode)
	return err;		return err;

	out_fail:		out_fail:
	ext2_dec_count(inode);		inode_dec_link_count(inode);
	ext2_dec_count(inode);		inode_dec_link_count(inode);
	iput(inode);		iput(inode);
	out_dir:		out_dir:
	ext2_dec_count(dir);		inode_dec_link_count(dir);
	goto out;		goto out;
	}		}

	@@ -282,7 +266,7 @@ static int ext2_unlink(struct inode * dir, struct dentry *dentry)
	goto out;		goto out;

	inode->i_ctime = dir->i_ctime;		inode->i_ctime = dir->i_ctime;
	ext2_dec_count(inode);		inode_dec_link_count(inode);
	err = 0;		err = 0;
	out:		out:
	return err;		return err;
	@@ -297,8 +281,8 @@ static int ext2_rmdir (struct inode * dir, struct dentry *dentry)
	err = ext2_unlink(dir, dentry);		err = ext2_unlink(dir, dentry);
	if (!err) {		if (!err) {
	inode->i_size = 0;		inode->i_size = 0;
	ext2_dec_count(inode);		inode_dec_link_count(inode);
	ext2_dec_count(dir);		inode_dec_link_count(dir);
	}		}
	}		}
	return err;		return err;
	@@ -338,41 +322,41 @@ static int ext2_rename (struct inode * old_dir, struct dentry * old_dentry,
	new_de = ext2_find_entry (new_dir, new_dentry, &new_page);		new_de = ext2_find_entry (new_dir, new_dentry, &new_page);
	if (!new_de)		if (!new_de)
	goto out_dir;		goto out_dir;
	ext2_inc_count(old_inode);		inode_inc_link_count(old_inode);
	ext2_set_link(new_dir, new_de, new_page, old_inode);		ext2_set_link(new_dir, new_de, new_page, old_inode);
	new_inode->i_ctime = CURRENT_TIME_SEC;		new_inode->i_ctime = CURRENT_TIME_SEC;
	if (dir_de)		if (dir_de)
	new_inode->i_nlink--;		new_inode->i_nlink--;
	ext2_dec_count(new_inode);		inode_dec_link_count(new_inode);
	} else {		} else {
	if (dir_de) {		if (dir_de) {
	err = -EMLINK;		err = -EMLINK;
	if (new_dir->i_nlink >= EXT2_LINK_MAX)		if (new_dir->i_nlink >= EXT2_LINK_MAX)
	goto out_dir;		goto out_dir;
	}		}
	ext2_inc_count(old_inode);		inode_inc_link_count(old_inode);
	err = ext2_add_link(new_dentry, old_inode);		err = ext2_add_link(new_dentry, old_inode);
	if (err) {		if (err) {
	ext2_dec_count(old_inode);		inode_dec_link_count(old_inode);
	goto out_dir;		goto out_dir;
	}		}
	if (dir_de)		if (dir_de)
	ext2_inc_count(new_dir);		inode_inc_link_count(new_dir);
	}		}

	/*		/*
	* Like most other Unix systems, set the ctime for inodes on a		* Like most other Unix systems, set the ctime for inodes on a
	* rename.		* rename.
	* ext2_dec_count() will mark the inode dirty.		* inode_dec_link_count() will mark the inode dirty.
	*/		*/
	old_inode->i_ctime = CURRENT_TIME_SEC;		old_inode->i_ctime = CURRENT_TIME_SEC;

	ext2_delete_entry (old_de, old_page);		ext2_delete_entry (old_de, old_page);
	ext2_dec_count(old_inode);		inode_dec_link_count(old_inode);

	if (dir_de) {		if (dir_de) {
	ext2_set_link(old_inode, dir_de, dir_page, new_dir);		ext2_set_link(old_inode, dir_de, dir_page, new_dir);
	ext2_dec_count(old_dir);		inode_dec_link_count(old_dir);
	}		}
	return 0;		return 0;