diff options
| author | Miklos Szeredi <mszeredi@suse.cz> | 2011-10-28 08:13:29 -0400 |
|---|---|---|
| committer | Christoph Hellwig <hch@serles.lst.de> | 2011-11-02 07:53:43 -0400 |
| commit | bfe8684869601dacfcb2cd69ef8cfd9045f62170 (patch) | |
| tree | 4e213aaa766b26f43f0f9ec7998a7745239d9377 | |
| parent | 6d6b77f163c7eabedbba00ed2abb7d4a570bff76 (diff) | |
filesystems: add set_nlink()
Replace remaining direct i_nlink updates with a new set_nlink()
updater function.
Signed-off-by: Miklos Szeredi <mszeredi@suse.cz>
Tested-by: Toshiyuki Okajima <toshi.okajima@jp.fujitsu.com>
Signed-off-by: Christoph Hellwig <hch@lst.de>
81 files changed, 163 insertions, 148 deletions
diff --git a/arch/s390/hypfs/inode.c b/arch/s390/hypfs/inode.c index baa82f8dd076..481f4f76f664 100644 --- a/arch/s390/hypfs/inode.c +++ b/arch/s390/hypfs/inode.c | |||
| @@ -108,7 +108,7 @@ static struct inode *hypfs_make_inode(struct super_block *sb, int mode) | |||
| 108 | ret->i_gid = hypfs_info->gid; | 108 | ret->i_gid = hypfs_info->gid; |
| 109 | ret->i_atime = ret->i_mtime = ret->i_ctime = CURRENT_TIME; | 109 | ret->i_atime = ret->i_mtime = ret->i_ctime = CURRENT_TIME; |
| 110 | if (mode & S_IFDIR) | 110 | if (mode & S_IFDIR) |
| 111 | ret->i_nlink = 2; | 111 | set_nlink(ret, 2); |
| 112 | } | 112 | } |
| 113 | return ret; | 113 | return ret; |
| 114 | } | 114 | } |
diff --git a/drivers/staging/pohmelfs/inode.c b/drivers/staging/pohmelfs/inode.c index f3c6060c96b8..7a1955583b7d 100644 --- a/drivers/staging/pohmelfs/inode.c +++ b/drivers/staging/pohmelfs/inode.c | |||
| @@ -1197,7 +1197,7 @@ const struct inode_operations pohmelfs_file_inode_operations = { | |||
| 1197 | void pohmelfs_fill_inode(struct inode *inode, struct netfs_inode_info *info) | 1197 | void pohmelfs_fill_inode(struct inode *inode, struct netfs_inode_info *info) |
| 1198 | { | 1198 | { |
| 1199 | inode->i_mode = info->mode; | 1199 | inode->i_mode = info->mode; |
| 1200 | inode->i_nlink = info->nlink; | 1200 | set_nlink(inode, info->nlink); |
| 1201 | inode->i_uid = info->uid; | 1201 | inode->i_uid = info->uid; |
| 1202 | inode->i_gid = info->gid; | 1202 | inode->i_gid = info->gid; |
| 1203 | inode->i_blocks = info->blocks; | 1203 | inode->i_blocks = info->blocks; |
diff --git a/fs/9p/vfs_inode.c b/fs/9p/vfs_inode.c index b5a1076aaa6c..879ed8851737 100644 --- a/fs/9p/vfs_inode.c +++ b/fs/9p/vfs_inode.c | |||
| @@ -1138,7 +1138,7 @@ v9fs_stat2inode(struct p9_wstat *stat, struct inode *inode, | |||
| 1138 | struct v9fs_session_info *v9ses = sb->s_fs_info; | 1138 | struct v9fs_session_info *v9ses = sb->s_fs_info; |
| 1139 | struct v9fs_inode *v9inode = V9FS_I(inode); | 1139 | struct v9fs_inode *v9inode = V9FS_I(inode); |
| 1140 | 1140 | ||
| 1141 | inode->i_nlink = 1; | 1141 | set_nlink(inode, 1); |
| 1142 | 1142 | ||
| 1143 | inode->i_atime.tv_sec = stat->atime; | 1143 | inode->i_atime.tv_sec = stat->atime; |
| 1144 | inode->i_mtime.tv_sec = stat->mtime; | 1144 | inode->i_mtime.tv_sec = stat->mtime; |
| @@ -1164,7 +1164,7 @@ v9fs_stat2inode(struct p9_wstat *stat, struct inode *inode, | |||
| 1164 | /* HARDLINKCOUNT %u */ | 1164 | /* HARDLINKCOUNT %u */ |
| 1165 | sscanf(ext, "%13s %u", tag_name, &i_nlink); | 1165 | sscanf(ext, "%13s %u", tag_name, &i_nlink); |
| 1166 | if (!strncmp(tag_name, "HARDLINKCOUNT", 13)) | 1166 | if (!strncmp(tag_name, "HARDLINKCOUNT", 13)) |
| 1167 | inode->i_nlink = i_nlink; | 1167 | set_nlink(inode, i_nlink); |
| 1168 | } | 1168 | } |
| 1169 | } | 1169 | } |
| 1170 | mode = stat->mode & S_IALLUGO; | 1170 | mode = stat->mode & S_IALLUGO; |
diff --git a/fs/9p/vfs_inode_dotl.c b/fs/9p/vfs_inode_dotl.c index aded79fcd5cf..0b5745e21946 100644 --- a/fs/9p/vfs_inode_dotl.c +++ b/fs/9p/vfs_inode_dotl.c | |||
| @@ -606,7 +606,7 @@ v9fs_stat2inode_dotl(struct p9_stat_dotl *stat, struct inode *inode) | |||
| 606 | inode->i_ctime.tv_nsec = stat->st_ctime_nsec; | 606 | inode->i_ctime.tv_nsec = stat->st_ctime_nsec; |
| 607 | inode->i_uid = stat->st_uid; | 607 | inode->i_uid = stat->st_uid; |
| 608 | inode->i_gid = stat->st_gid; | 608 | inode->i_gid = stat->st_gid; |
| 609 | inode->i_nlink = stat->st_nlink; | 609 | set_nlink(inode, stat->st_nlink); |
| 610 | 610 | ||
| 611 | mode = stat->st_mode & S_IALLUGO; | 611 | mode = stat->st_mode & S_IALLUGO; |
| 612 | mode |= inode->i_mode & ~S_IALLUGO; | 612 | mode |= inode->i_mode & ~S_IALLUGO; |
| @@ -632,7 +632,7 @@ v9fs_stat2inode_dotl(struct p9_stat_dotl *stat, struct inode *inode) | |||
| 632 | if (stat->st_result_mask & P9_STATS_GID) | 632 | if (stat->st_result_mask & P9_STATS_GID) |
| 633 | inode->i_gid = stat->st_gid; | 633 | inode->i_gid = stat->st_gid; |
| 634 | if (stat->st_result_mask & P9_STATS_NLINK) | 634 | if (stat->st_result_mask & P9_STATS_NLINK) |
| 635 | inode->i_nlink = stat->st_nlink; | 635 | set_nlink(inode, stat->st_nlink); |
| 636 | if (stat->st_result_mask & P9_STATS_MODE) { | 636 | if (stat->st_result_mask & P9_STATS_MODE) { |
| 637 | inode->i_mode = stat->st_mode; | 637 | inode->i_mode = stat->st_mode; |
| 638 | if ((S_ISBLK(inode->i_mode)) || | 638 | if ((S_ISBLK(inode->i_mode)) || |
diff --git a/fs/adfs/inode.c b/fs/adfs/inode.c index d5250c5aae21..1dab6a174d6a 100644 --- a/fs/adfs/inode.c +++ b/fs/adfs/inode.c | |||
| @@ -247,7 +247,7 @@ adfs_iget(struct super_block *sb, struct object_info *obj) | |||
| 247 | inode->i_gid = ADFS_SB(sb)->s_gid; | 247 | inode->i_gid = ADFS_SB(sb)->s_gid; |
| 248 | inode->i_ino = obj->file_id; | 248 | inode->i_ino = obj->file_id; |
| 249 | |||
