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

Commit 6d6b77f1 authored by Miklos Szeredi's avatar Miklos Szeredi Committed by Christoph Hellwig
Browse files

filesystems: add missing nlink wrappers 



Replace direct i_nlink updates with the respective updater function
(inc_nlink, drop_nlink, clear_nlink, inode_dec_link_count).

Signed-off-by: default avatarMiklos Szeredi <mszeredi@suse.cz>
parent dd2a981f

arch/s390/hypfs/inode.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -359,7 +359,7 @@ static struct dentry *hypfs_create_file(struct super_block *sb, 
	} else if (mode & S_IFDIR) {

	} else if (mode & S_IFDIR) {

		inode->i_op = &simple_dir_inode_operations;

		inode->i_op = &simple_dir_inode_operations;

		inode->i_fop = &simple_dir_operations;

		inode->i_fop = &simple_dir_operations;

		parent->d_inode->i_nlink++;

		inc_nlink(parent->d_inode);

	} else

	} else

		BUG();

		BUG();

	inode->i_private = data;

	inode->i_private = data;

drivers/mtd/mtdchar.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -1144,7 +1144,7 @@ static void mtdchar_notify_remove(struct mtd_info *mtd) 




	if (mtd_ino) {

	if (mtd_ino) {

		/* Destroy the inode if it exists */

		/* Destroy the inode if it exists */

		mtd_ino->i_nlink = 0;

		clear_nlink(mtd_ino);

		iput(mtd_ino);

		iput(mtd_ino);

	}

	}

}

}

fs/affs/amigaffs.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -316,7 +316,7 @@ affs_remove_header(struct dentry *dentry) 
	if (inode->i_nlink > 1)

	if (inode->i_nlink > 1)

		retval = affs_remove_link(dentry);

		retval = affs_remove_link(dentry);

	else

	else

		inode->i_nlink = 0;

		clear_nlink(inode);

	affs_unlock_link(inode);

	affs_unlock_link(inode);

	inode->i_ctime = CURRENT_TIME_SEC;

	inode->i_ctime = CURRENT_TIME_SEC;

	mark_inode_dirty(inode);

	mark_inode_dirty(inode);

fs/affs/namei.c

+3 −3
Original line number Original line Diff line number Diff line
@@ -277,7 +277,7 @@ affs_create(struct inode *dir, struct dentry *dentry, int mode, struct nameidata 
	inode->i_mapping->a_ops = (AFFS_SB(sb)->s_flags & SF_OFS) ? &affs_aops_ofs : &affs_aops;

	inode->i_mapping->a_ops = (AFFS_SB(sb)->s_flags & SF_OFS) ? &affs_aops_ofs : &affs_aops;

	error = affs_add_entry(dir, inode, dentry, ST_FILE);

	error = affs_add_entry(dir, inode, dentry, ST_FILE);

	if (error) {

	if (error) {

		inode->i_nlink = 0;

		clear_nlink(inode);

		iput(inode);

		iput(inode);

		return error;

		return error;

	}

	}
@@ -305,7 +305,7 @@ affs_mkdir(struct inode *dir, struct dentry *dentry, int mode) 




	error = affs_add_entry(dir, inode, dentry, ST_USERDIR);

	error = affs_add_entry(dir, inode, dentry, ST_USERDIR);

	if (error) {

	if (error) {

		inode->i_nlink = 0;

		clear_nlink(inode);

		mark_inode_dirty(inode);

		mark_inode_dirty(inode);

		iput(inode);

		iput(inode);

		return error;

		return error;
@@ -392,7 +392,7 @@ affs_symlink(struct inode *dir, struct dentry *dentry, const char *symname) 
	return 0;

	return 0;





err:

err:

	inode->i_nlink = 0;

	clear_nlink(inode);

	mark_inode_dirty(inode);

	mark_inode_dirty(inode);

	iput(inode);

	iput(inode);

	return error;

	return error;

fs/binfmt_misc.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -521,7 +521,7 @@ static void kill_node(Node *e) 
	write_unlock(&entries_lock);

	write_unlock(&entries_lock);





	if (dentry) {

	if (dentry) {

		dentry->d_inode->i_nlink--;

		drop_nlink(dentry->d_inode);

		d_drop(dentry);

		d_drop(dentry);

		dput(dentry);

		dput(dentry);

		simple_release_fs(&bm_mnt, &entry_count);

		simple_release_fs(&bm_mnt, &entry_count);