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

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

filesystems: add set_nlink() 



Replace remaining direct i_nlink updates with a new set_nlink()
updater function.

Signed-off-by: default avatarMiklos Szeredi <mszeredi@suse.cz>
Tested-by: default avatarToshiyuki Okajima <toshi.okajima@jp.fujitsu.com>
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
parent 6d6b77f1

arch/s390/hypfs/inode.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -108,7 +108,7 @@ static struct inode *hypfs_make_inode(struct super_block *sb, int mode) 
		ret->i_gid = hypfs_info->gid;

		ret->i_gid = hypfs_info->gid;

		ret->i_atime = ret->i_mtime = ret->i_ctime = CURRENT_TIME;

		ret->i_atime = ret->i_mtime = ret->i_ctime = CURRENT_TIME;

		if (mode & S_IFDIR)

		if (mode & S_IFDIR)

			ret->i_nlink = 2;

			set_nlink(ret, 2);

	}

	}

	return ret;

	return ret;

}

}

drivers/staging/pohmelfs/inode.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -1197,7 +1197,7 @@ const struct inode_operations pohmelfs_file_inode_operations = { 
void pohmelfs_fill_inode(struct inode *inode, struct netfs_inode_info *info)

void pohmelfs_fill_inode(struct inode *inode, struct netfs_inode_info *info)

{

{

	inode->i_mode = info->mode;

	inode->i_mode = info->mode;

	inode->i_nlink = info->nlink;

	set_nlink(inode, info->nlink);

	inode->i_uid = info->uid;

	inode->i_uid = info->uid;

	inode->i_gid = info->gid;

	inode->i_gid = info->gid;

	inode->i_blocks = info->blocks;

	inode->i_blocks = info->blocks;

fs/9p/vfs_inode.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -1138,7 +1138,7 @@ v9fs_stat2inode(struct p9_wstat *stat, struct inode *inode, 
	struct v9fs_session_info *v9ses = sb->s_fs_info;

	struct v9fs_session_info *v9ses = sb->s_fs_info;

	struct v9fs_inode *v9inode = V9FS_I(inode);

	struct v9fs_inode *v9inode = V9FS_I(inode);





	inode->i_nlink = 1;

	set_nlink(inode, 1);





	inode->i_atime.tv_sec = stat->atime;

	inode->i_atime.tv_sec = stat->atime;

	inode->i_mtime.tv_sec = stat->mtime;

	inode->i_mtime.tv_sec = stat->mtime;
@@ -1164,7 +1164,7 @@ v9fs_stat2inode(struct p9_wstat *stat, struct inode *inode, 
			/* HARDLINKCOUNT %u */

			/* HARDLINKCOUNT %u */

			sscanf(ext, "%13s %u", tag_name, &i_nlink);

			sscanf(ext, "%13s %u", tag_name, &i_nlink);

			if (!strncmp(tag_name, "HARDLINKCOUNT", 13))

			if (!strncmp(tag_name, "HARDLINKCOUNT", 13))

				inode->i_nlink = i_nlink;

				set_nlink(inode, i_nlink);

		}

		}

	}

	}

	mode = stat->mode & S_IALLUGO;

	mode = stat->mode & S_IALLUGO;

fs/9p/vfs_inode_dotl.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -606,7 +606,7 @@ v9fs_stat2inode_dotl(struct p9_stat_dotl *stat, struct inode *inode) 
		inode->i_ctime.tv_nsec = stat->st_ctime_nsec;

		inode->i_ctime.tv_nsec = stat->st_ctime_nsec;

		inode->i_uid = stat->st_uid;

		inode->i_uid = stat->st_uid;

		inode->i_gid = stat->st_gid;

		inode->i_gid = stat->st_gid;

		inode->i_nlink = stat->st_nlink;

		set_nlink(inode, stat->st_nlink);





		mode = stat->st_mode & S_IALLUGO;

		mode = stat->st_mode & S_IALLUGO;

		mode |= inode->i_mode & ~S_IALLUGO;

		mode |= inode->i_mode & ~S_IALLUGO;
@@ -632,7 +632,7 @@ v9fs_stat2inode_dotl(struct p9_stat_dotl *stat, struct inode *inode) 
		if (stat->st_result_mask & P9_STATS_GID)

		if (stat->st_result_mask & P9_STATS_GID)

			inode->i_gid = stat->st_gid;

			inode->i_gid = stat->st_gid;

		if (stat->st_result_mask & P9_STATS_NLINK)

		if (stat->st_result_mask & P9_STATS_NLINK)

			inode->i_nlink = stat->st_nlink;

			set_nlink(inode, stat->st_nlink);

		if (stat->st_result_mask & P9_STATS_MODE) {

		if (stat->st_result_mask & P9_STATS_MODE) {

			inode->i_mode = stat->st_mode;

			inode->i_mode = stat->st_mode;

			if ((S_ISBLK(inode->i_mode)) ||

			if ((S_ISBLK(inode->i_mode)) ||

fs/adfs/inode.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -247,7 +247,7 @@ adfs_iget(struct super_block *sb, struct object_info *obj) 
	inode->i_gid	 = ADFS_SB(sb)->s_gid;

	inode->i_gid	 = ADFS_SB(sb)->s_gid;

	inode->i_ino	 = obj->file_id;

	inode->i_ino	 = obj->file_id;

	inode->i_size	 = obj->size;

	inode->i_size	 = obj->size;

	inode->i_nlink	 = 2;

	set_nlink(inode, 2);

	inode->i_blocks	 = (inode->i_size + sb->s_blocksize - 1) >>

	inode->i_blocks	 = (inode->i_size + sb->s_blocksize - 1) >>

			    sb->s_blocksize_bits;

			    sb->s_blocksize_bits;