History

filesystems: add set_nlink()

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

Miklos Szeredi committed 15 years ago

Commit bfe86841 parent 6d6b77f81 files · +163 −148Browse files

Unified · Split

81 files
  1. arch/s390/hypfs/inode.c +1 −1
  2. drivers/staging/pohmelfs/inode.c +1 −1
  3. fs/9p/vfs_inode.c +2 −2
  4. fs/9p/vfs_inode_dotl.c +2 −2
  5. fs/adfs/inode.c +1 −1
  6. fs/affs/amigaffs.c +1 −1
  7. fs/affs/inode.c +4 −4
  8. fs/afs/fsclient.c +1 −1
  9. fs/afs/inode.c +2 −2
  10. fs/autofs4/inode.c +1 −1
  11. fs/befs/linuxvfs.c +1 −1
  12. fs/bfs/dir.c +1 −1
  13. fs/bfs/inode.c +1 −1
  14. fs/btrfs/delayed-inode.c +1 −1
  15. fs/btrfs/disk-io.c +1 −1
  16. fs/btrfs/inode.c +2 −2
  17. fs/btrfs/tree-log.c +1 −1
  18. fs/ceph/caps.c +1 −1
  19. fs/ceph/inode.c +1 −1
  20. fs/cifs/inode.c +3 −3
  21. fs/coda/coda_linux.c +1 −1
  22. fs/devpts/inode.c +1 −1
  23. fs/ecryptfs/inode.c +6 −6
  24. fs/efs/inode.c +1 −1
  25. fs/exofs/inode.c +1 −1
  26. fs/ext2/inode.c +1 −1
  27. fs/ext3/inode.c +1 −1
  28. fs/ext3/namei.c +2 −2
  29. fs/ext4/inode.c +1 −1
  30. fs/ext4/namei.c +3 −3
  31. fs/fat/inode.c +2 −2
  32. fs/fat/namei_msdos.c +1 −1
  33. fs/fat/namei_vfat.c +1 −1
  34. fs/freevxfs/vxfs_inode.c +1 −1
  35. fs/fuse/control.c +1 −1
  36. fs/fuse/inode.c +1 −1
  37. fs/gfs2/glops.c +1 −1
  38. fs/hfs/inode.c +2 −2
  39. fs/hfsplus/inode.c +5 −5
  40. fs/hostfs/hostfs_kern.c +1 −1
  41. fs/hpfs/dir.c +1 −1
  42. fs/hpfs/inode.c +4 −4
  43. fs/hpfs/namei.c +4 −4
  44. fs/hppfs/hppfs.c +1 −1
  45. fs/isofs/inode.c +2 −2
  46. fs/isofs/rock.c +2 −2
  47. fs/jffs2/dir.c +3 −3
  48. fs/jffs2/fs.c +3 −3
  49. fs/jfs/jfs_imap.c +3 −3
  50. fs/jfs/namei.c +1 −1
  51. fs/libfs.c +1 −1
  52. fs/logfs/readwrite.c +1 −1
  53. fs/minix/inode.c +2 −2
  54. fs/ncpfs/inode.c +1 −1
  55. fs/nfs/inode.c +2 −2
  56. fs/nilfs2/inode.c +1 −1
  57. fs/nilfs2/namei.c +1 −1
  58. fs/ntfs/inode.c +4 −4
  59. fs/ocfs2/dir.c +2 −2
  60. fs/ocfs2/dlmglue.c +1 −1
  61. fs/ocfs2/inode.c +2 −2
  62. fs/ocfs2/namei.c +4 −4
  63. fs/openpromfs/inode.c +2 −2
  64. fs/proc/base.c +6 −6
  65. fs/proc/generic.c +1 −1
  66. fs/proc/inode.c +1 −1
  67. fs/qnx4/inode.c +1 −1
  68. fs/reiserfs/inode.c +3 −3
  69. fs/reiserfs/namei.c +2 −2
  70. fs/romfs/super.c +1 −1
  71. fs/squashfs/inode.c +9 −9
  72. fs/stack.c +1 −1
  73. fs/sysfs/inode.c +1 −1
  74. fs/sysv/inode.c +1 −1
  75. fs/ubifs/super.c +1 −1
  76. fs/ubifs/xattr.c +1 −1
  77. fs/udf/inode.c +5 −3
  78. fs/udf/namei.c +2 −2
  79. fs/ufs/inode.c +2 −2
  80. fs/xfs/xfs_iops.c +1 −1
  81. include/linux/fs.h +13 −0
arch/s390/hypfs/inode.c+1−1
@@ -108,7 +108,7 @@ static struct inode *hypfs_make_inode(struct super_block *sb, int mode) · 107 unmodified lines
108108 ret->i_gid = hypfs_info->gid;
109109 ret->i_atime = ret->i_mtime = ret->i_ctime = CURRENT_TIME;
110110 if (mode & S_IFDIR)
111− ret->i_nlink = 2;
111+ set_nlink(ret, 2);
112112 }
113113 return ret;
114114 }
drivers/staging/pohmelfs/inode.c+1−1
@@ -1197,7 +1197,7 @@ const struct inode_operations pohmelfs_file_inode_operations = { · 1196 unmodified lines
11971197 void pohmelfs_fill_inode(struct inode *inode, struct netfs_inode_info *info)
11981198 {
11991199 inode->i_mode = info->mode;
1200− inode->i_nlink = info->nlink;
1200+ set_nlink(inode, info->nlink);
12011201 inode->i_uid = info->uid;
12021202 inode->i_gid = info->gid;
12031203 inode->i_blocks = info->blocks;
fs/9p/vfs_inode.c+2−2
@@ -1138,7 +1138,7 @@ v9fs_stat2inode(struct p9_wstat *stat, struct inode *inode, · 1137 unmodified lines
11381138 struct v9fs_session_info *v9ses = sb->s_fs_info;
11391139 struct v9fs_inode *v9inode = V9FS_I(inode);
11401140
1141− inode->i_nlink = 1;
1141+ set_nlink(inode, 1);
11421142
11431143 inode->i_atime.tv_sec = stat->atime;
11441144 inode->i_mtime.tv_sec = stat->mtime;
@@ -1164,7 +1164,7 @@ v9fs_stat2inode(struct p9_wstat *stat, struct inode *inode, · 19 unmodified lines
11641164 /* HARDLINKCOUNT %u */
11651165 sscanf(ext, "%13s %u", tag_name, &i_nlink);
11661166 if (!strncmp(tag_name, "HARDLINKCOUNT", 13))
1167− inode->i_nlink = i_nlink;
1167+ set_nlink(inode, i_nlink);
11681168 }
11691169 }
11701170 mode = stat->mode & S_IALLUGO;
fs/9p/vfs_inode_dotl.c+2−2
@@ -606,7 +606,7 @@ v9fs_stat2inode_dotl(struct p9_stat_dotl *stat, struct inode *inode) · 605 unmodified lines
606606 inode->i_ctime.tv_nsec = stat->st_ctime_nsec;
607607 inode->i_uid = stat->st_uid;
608608 inode->i_gid = stat->st_gid;
609− inode->i_nlink = stat->st_nlink;
609+ set_nlink(inode, stat->st_nlink);
610610
611611 mode = stat->st_mode & S_IALLUGO;
612612 mode |= inode->i_mode & ~S_IALLUGO;
@@ -632,7 +632,7 @@ v9fs_stat2inode_dotl(struct p9_stat_dotl *stat, struct inode *inode) · 19 unmodified lines
632632 if (stat->st_result_mask & P9_STATS_GID)
633633 inode->i_gid = stat->st_gid;
634634 if (stat->st_result_mask & P9_STATS_NLINK)
635− inode->i_nlink = stat->st_nlink;
635+ set_nlink(inode, stat->st_nlink);
636636 if (stat->st_result_mask & P9_STATS_MODE) {
637637 inode->i_mode = stat->st_mode;
638638 if ((S_ISBLK(inode->i_mode)) ||
fs/adfs/inode.c+1−1
@@ -247,7 +247,7 @@ adfs_iget(struct super_block *sb, struct object_info *obj) · 246 unmodified lines
247247 inode->i_gid = ADFS_SB(sb)->s_gid;
248248 inode->i_ino = obj->file_id;
249249 inode->i_size = obj->size;
250− inode->i_nlink = 2;
250+ set_nlink(inode, 2);
251251 inode->i_blocks = (inode->i_size + sb->s_blocksize - 1) >>
252252 sb->s_blocksize_bits;
253253
fs/affs/amigaffs.c+1−1
@@ -215,7 +215,7 @@ affs_remove_link(struct dentry *dentry) · 214 unmodified lines
215215 break;
216216 default:
217217 if (!AFFS_TAIL(sb, bh)->link_chain)
218− inode->i_nlink = 1;
218+ set_nlink(inode, 1);
219219 }
220220 affs_free_block(sb, link_ino);
221221 goto done;
fs/affs/inode.c+4−4
@@ -54,7 +54,7 @@ struct inode *affs_iget(struct super_block *sb, unsigned long ino) · 53 unmodified lines
5454 prot = be32_to_cpu(tail->protect);
5555
5656 inode->i_size = 0;
57− inode->i_nlink = 1;
57+ set_nlink(inode, 1);
5858 inode->i_mode = 0;
5959 AFFS_I(inode)->i_extcnt = 1;
6060 AFFS_I(inode)->i_ext_last = ~1;
@@ -137,7 +137,7 @@ struct inode *affs_iget(struct super_block *sb, unsigned long ino) · 76 unmodified lines
137137 sbi->s_hashsize + 1;
138138 }
139139 if (tail->link_chain)
140− inode->i_nlink = 2;
140+ set_nlink(inode, 2);
141141 inode->i_mapping->a_ops = (sbi->s_flags & SF_OFS) ? &affs_aops_ofs : &affs_aops;
142142 inode->i_op = &affs_file_inode_operations;
143143 inode->i_fop = &affs_file_operations;
@@ -304,7 +304,7 @@ affs_new_inode(struct inode *dir) · 160 unmodified lines
304304 inode->i_uid = current_fsuid();
305305 inode->i_gid = current_fsgid();
306306 inode->i_ino = block;
307− inode->i_nlink = 1;
307+ set_nlink(inode, 1);
308308 inode->i_mtime = inode->i_atime = inode->i_ctime = CURRENT_TIME_SEC;
309309 atomic_set(&AFFS_I(inode)->i_opencnt, 0);
310310 AFFS_I(inode)->i_blkcnt = 0;
@@ -387,7 +387,7 @@ affs_add_entry(struct inode *dir, struct inode *inode, struct dentry *dentry, s3 · 76 unmodified lines
387387 AFFS_TAIL(sb, inode_bh)->link_chain = cpu_to_be32(block);
388388 affs_adjust_checksum(inode_bh, block - be32_to_cpu(chain));
389389 mark_buffer_dirty_inode(inode_bh, inode);
390− inode->i_nlink = 2;
390+ set_nlink(inode, 2);
391391 ihold(inode);
392392 }
393393 affs_fix_checksum(sb, bh);
fs/afs/fsclient.c+1−1
@@ -90,7 +90,7 @@ static void xdr_decode_AFSFetchStatus(const __be32 **_bp, · 89 unmodified lines
9090 vnode->vfs_inode.i_uid = status->owner;
9191 vnode->vfs_inode.i_gid = status->group;
9292 vnode->vfs_inode.i_generation = vnode->fid.unique;
93− vnode->vfs_inode.i_nlink = status->nlink;
93+ set_nlink(&vnode->vfs_inode, status->nlink);
9494
9595 mode = vnode->vfs_inode.i_mode;
9696 mode &= ~S_IALLUGO;
fs/afs/inode.c+2−2
@@ -67,7 +67,7 @@ static int afs_inode_map_status(struct afs_vnode *vnode, struct key *key) · 66 unmodified lines
6767 fscache_attr_changed(vnode->cache);
6868 #endif
6969
70− inode->i_nlink = vnode->status.nlink;
70+ set_nlink(inode, vnode->status.nlink);
7171 inode->i_uid = vnode->status.owner;
7272 inode->i_gid = 0;
7373 inode->i_size = vnode->status.size;
@@ -174,7 +174,7 @@ struct inode *afs_iget_autocell(struct inode *dir, const char *dev_name, · 100 unmodified lines
174174 inode->i_size = 0;
175175 inode->i_mode = S_IFDIR | S_IRUGO | S_IXUGO;
176176 inode->i_op = &afs_autocell_inode_operations;
177− inode->i_nlink = 2;
177+ set_nlink(inode, 2);
178178 inode->i_uid = 0;
179179 inode->i_gid = 0;
180180 inode->i_ctime.tv_sec = get_seconds();
fs/autofs4/inode.c+1−1
@@ -342,7 +342,7 @@ struct inode *autofs4_get_inode(struct super_block *sb, mode_t mode) · 341 unmodified lines
342342 inode->i_ino = get_next_ino();
343343
344344 if (S_ISDIR(mode)) {
345− inode->i_nlink = 2;
345+ set_nlink(inode, 2);
346346 inode->i_op = &autofs4_dir_inode_operations;
347347 inode->i_fop = &autofs4_dir_operations;
348348 } else if (S_ISLNK(mode)) {
fs/befs/linuxvfs.c+1−1
@@ -357,7 +357,7 @@ static struct inode *befs_iget(struct super_block *sb, unsigned long ino) · 356 unmodified lines
357357 inode->i_gid = befs_sb->mount_opts.use_gid ?
358358 befs_sb->mount_opts.gid : (gid_t) fs32_to_cpu(sb, raw_inode->gid);
359359
360− inode->i_nlink = 1;
360+ set_nlink(inode, 1);
361361
362362 /*
363363 * BEFS's time is 64 bits, but current VFS is 32 bits...
fs/bfs/dir.c+1−1
@@ -199,7 +199,7 @@ static int bfs_unlink(struct inode *dir, struct dentry *dentry) · 198 unmodified lines
199199 printf("unlinking non-existent file %s:%lu (nlink=%d)\n",
200200 inode->i_sb->s_id, inode->i_ino,
201201 inode->i_nlink);
202− inode->i_nlink = 1;
202+ set_nlink(inode, 1);
203203 }
204204 de->ino = 0;
205205 mark_buffer_dirty_inode(bh, dir);
fs/bfs/inode.c+1−1
@@ -78,7 +78,7 @@ struct inode *bfs_iget(struct super_block *sb, unsigned long ino) · 77 unmodified lines
7878 BFS_I(inode)->i_dsk_ino = le16_to_cpu(di->i_ino);
7979 inode->i_uid = le32_to_cpu(di->i_uid);
8080 inode->i_gid = le32_to_cpu(di->i_gid);
81− inode->i_nlink = le32_to_cpu(di->i_nlink);
81+ set_nlink(inode, le32_to_cpu(di->i_nlink));
8282 inode->i_size = BFS_FILESIZE(di);
8383 inode->i_blocks = BFS_FILEBLOCKS(di);
8484 inode->i_atime.tv_sec = le32_to_cpu(di->i_atime);
fs/btrfs/delayed-inode.c+1−1
@@ -1641,7 +1641,7 @@ int btrfs_fill_inode(struct inode *inode, u32 *rdev) · 1640 unmodified lines
16411641 inode->i_gid = btrfs_stack_inode_gid(inode_item);
16421642 btrfs_i_size_write(inode, btrfs_stack_inode_size(inode_item));
16431643 inode->i_mode = btrfs_stack_inode_mode(inode_item);
1644− inode->i_nlink = btrfs_stack_inode_nlink(inode_item);
1644+ set_nlink(inode, btrfs_stack_inode_nlink(inode_item));
16451645 inode_set_bytes(inode, btrfs_stack_inode_nbytes(inode_item));
16461646 BTRFS_I(inode)->generation = btrfs_stack_inode_generation(inode_item);
16471647 BTRFS_I(inode)->sequence = btrfs_stack_inode_sequence(inode_item);
fs/btrfs/disk-io.c+1−1
@@ -1705,7 +1705,7 @@ struct btrfs_root *open_ctree(struct super_block *sb, · 1704 unmodified lines
17051705 sb->s_bdi = &fs_info->bdi;
17061706
17071707 fs_info->btree_inode->i_ino = BTRFS_BTREE_INODE_OBJECTID;
1708− fs_info->btree_inode->i_nlink = 1;
1708+ set_nlink(fs_info->btree_inode, 1);
17091709 /*
17101710 * we set the i_size on the btree inode to the max possible int.
17111711 * the real end of the address space is determined by all of
fs/btrfs/inode.c+2−2
@@ -2534,7 +2534,7 @@ static void btrfs_read_locked_inode(struct inode *inode) · 2533 unmodified lines
25342534 inode_item = btrfs_item_ptr(leaf, path->slots[0],
25352535 struct btrfs_inode_item);
25362536 inode->i_mode = btrfs_inode_mode(leaf, inode_item);
2537− inode->i_nlink = btrfs_inode_nlink(leaf, inode_item);
2537+ set_nlink(inode, btrfs_inode_nlink(leaf, inode_item));
25382538 inode->i_uid = btrfs_inode_uid(leaf, inode_item);
25392539 inode->i_gid = btrfs_inode_gid(leaf, inode_item);
25402540 btrfs_i_size_write(inode, btrfs_inode_size(leaf, inode_item));
@@ -6728,7 +6728,7 @@ int btrfs_create_subvol_root(struct btrfs_trans_handle *trans, · 4187 unmodified lines
67286728 inode->i_op = &btrfs_dir_inode_operations;
67296729 inode->i_fop = &btrfs_dir_file_operations;
67306730
6731− inode->i_nlink = 1;
6731+ set_nlink(inode, 1);
67326732 btrfs_i_size_write(inode, 0);
67336733
67346734 err = btrfs_update_inode(trans, new_root, inode);
fs/btrfs/tree-log.c+1−1
@@ -1030,7 +1030,7 @@ static noinline int fixup_inode_link_count(struct btrfs_trans_handle *trans, · 1029 unmodified lines
10301030 }
10311031 btrfs_release_path(path);
10321032 if (nlink != inode->i_nlink) {
1033− inode->i_nlink = nlink;
1033+ set_nlink(inode, nlink);
10341034 btrfs_update_inode(trans, root, inode);
10351035 }
10361036 BTRFS_I(inode)->index_cnt = (u64)-1;
fs/ceph/caps.c+1−1
@@ -2363,7 +2363,7 @@ static void handle_cap_grant(struct inode *inode, struct ceph_mds_caps *grant, · 2362 unmodified lines
23632363 }
23642364
23652365 if ((issued & CEPH_CAP_LINK_EXCL) == 0)
2366− inode->i_nlink = le32_to_cpu(grant->nlink);
2366+ set_nlink(inode, le32_to_cpu(grant->nlink));
23672367
23682368 if ((issued & CEPH_CAP_XATTR_EXCL) == 0 && grant->xattr_len) {
23692369 int len = le32_to_cpu(grant->xattr_len);
fs/ceph/inode.c+1−1
@@ -618,7 +618,7 @@ static int fill_inode(struct inode *inode, · 617 unmodified lines
618618 }
619619
620620 if ((issued & CEPH_CAP_LINK_EXCL) == 0)
621− inode->i_nlink = le32_to_cpu(info->nlink);
621+ set_nlink(inode, le32_to_cpu(info->nlink));
622622
623623 /* be careful with mtime, atime, size */
624624 ceph_decode_timespec(&atime, &info->atime);
fs/cifs/inode.c+3−3
@@ -132,7 +132,7 @@ cifs_fattr_to_inode(struct inode *inode, struct cifs_fattr *fattr) · 131 unmodified lines
132132 inode->i_mtime = fattr->cf_mtime;
133133 inode->i_ctime = fattr->cf_ctime;
134134 inode->i_rdev = fattr->cf_rdev;
135− inode->i_nlink = fattr->cf_nlink;
135+ set_nlink(inode, fattr->cf_nlink);
136136 inode->i_uid = fattr->cf_uid;
137137 inode->i_gid = fattr->cf_gid;
138138
@@ -905,7 +905,7 @@ struct inode *cifs_root_iget(struct super_block *sb) · 766 unmodified lines
905905 if (rc && tcon->ipc) {
906906 cFYI(1, "ipc connection - fake read inode");
907907 inode->i_mode |= S_IFDIR;
908− inode->i_nlink = 2;
908+ set_nlink(inode, 2);
909909 inode->i_op = &cifs_ipc_inode_ops;
910910 inode->i_fop = &simple_dir_operations;
911911 inode->i_uid = cifs_sb->mnt_uid;
@@ -1367,7 +1367,7 @@ mkdir_get_info: · 455 unmodified lines
13671367 /* setting nlink not necessary except in cases where we
13681368 * failed to get it from the server or was set bogus */
13691369 if ((direntry->d_inode) && (direntry->d_inode->i_nlink < 2))
1370− direntry->d_inode->i_nlink = 2;
1370+ set_nlink(direntry->d_inode, 2);
13711371
13721372 mode &= ~current_umask();
13731373 /* must turn on setgid bit if parent dir has it */
fs/coda/coda_linux.c+1−1
@@ -104,7 +104,7 @@ void coda_vattr_to_iattr(struct inode *inode, struct coda_vattr *attr) · 103 unmodified lines
104104 if (attr->va_gid != -1)
105105 inode->i_gid = (gid_t) attr->va_gid;
106106 if (attr->va_nlink != -1)
107− inode->i_nlink = attr->va_nlink;
107+ set_nlink(inode, attr->va_nlink);
108108 if (attr->va_size != -1)
109109 inode->i_size = attr->va_size;
110110 if (attr->va_size != -1)
fs/devpts/inode.c+1−1
@@ -307,7 +307,7 @@ devpts_fill_super(struct super_block *s, void *data, int silent) · 306 unmodified lines
307307 inode->i_mode = S_IFDIR | S_IRUGO | S_IXUGO | S_IWUSR;
308308 inode->i_op = &simple_dir_inode_operations;
309309 inode->i_fop = &simple_dir_operations;
310− inode->i_nlink = 2;
310+ set_nlink(inode, 2);
311311
312312 s->s_root = d_alloc_root(inode);
313313 if (s->s_root)
fs/ecryptfs/inode.c+6−6
@@ -474,8 +474,8 @@ static int ecryptfs_link(struct dentry *old_dentry, struct inode *dir, · 473 unmodified lines
474474 goto out_lock;
475475 fsstack_copy_attr_times(dir, lower_dir_dentry->d_inode);
476476 fsstack_copy_inode_size(dir, lower_dir_dentry->d_inode);
477− old_dentry->d_inode->i_nlink =
478− ecryptfs_inode_to_lower(old_dentry->d_inode)->i_nlink;
477+ set_nlink(old_dentry->d_inode,
478+ ecryptfs_inode_to_lower(old_dentry->d_inode)->i_nlink);
479479 i_size_write(new_dentry->d_inode, file_size_save);
480480 out_lock:
481481 unlock_dir(lower_dir_dentry);
@@ -499,8 +499,8 @@ static int ecryptfs_unlink(struct inode *dir, struct dentry *dentry) · 17 unmodified lines
499499 goto out_unlock;
500500 }
501501 fsstack_copy_attr_times(dir, lower_dir_inode);
502− dentry->d_inode->i_nlink =
503− ecryptfs_inode_to_lower(dentry->d_inode)->i_nlink;
502+ set_nlink(dentry->d_inode,
503+ ecryptfs_inode_to_lower(dentry->d_inode)->i_nlink);
504504 dentry->d_inode->i_ctime = dir->i_ctime;
505505 d_drop(dentry);
506506 out_unlock:
@@ -565,7 +565,7 @@ static int ecryptfs_mkdir(struct inode *dir, struct dentry *dentry, int mode) · 58 unmodified lines
565565 goto out;
566566 fsstack_copy_attr_times(dir, lower_dir_dentry->d_inode);
567567 fsstack_copy_inode_size(dir, lower_dir_dentry->d_inode);
568− dir->i_nlink = lower_dir_dentry->d_inode->i_nlink;
568+ set_nlink(dir, lower_dir_dentry->d_inode->i_nlink);
569569 out:
570570 unlock_dir(lower_dir_dentry);
571571 if (!dentry->d_inode)
@@ -588,7 +588,7 @@ static int ecryptfs_rmdir(struct inode *dir, struct dentry *dentry) · 16 unmodified lines
588588 if (!rc && dentry->d_inode)
589589 clear_nlink(dentry->d_inode);
590590 fsstack_copy_attr_times(dir, lower_dir_dentry->d_inode);
591− dir->i_nlink = lower_dir_dentry->d_inode->i_nlink;
591+ set_nlink(dir, lower_dir_dentry->d_inode->i_nlink);
592592 unlock_dir(lower_dir_dentry);
593593 if (!rc)
594594 d_drop(dentry);
fs/efs/inode.c+1−1
@@ -96,7 +96,7 @@ struct inode *efs_iget(struct super_block *super, unsigned long ino) · 95 unmodified lines
9696 efs_inode = (struct efs_dinode *) (bh->b_data + offset);
9797
9898 inode->i_mode = be16_to_cpu(efs_inode->di_mode);
99− inode->i_nlink = be16_to_cpu(efs_inode->di_nlink);
99+ set_nlink(inode, be16_to_cpu(efs_inode->di_nlink));
100100 inode->i_uid = (uid_t)be16_to_cpu(efs_inode->di_uid);
101101 inode->i_gid = (gid_t)be16_to_cpu(efs_inode->di_gid);
102102 inode->i_size = be32_to_cpu(efs_inode->di_size);
fs/exofs/inode.c+1−1
@@ -1165,7 +1165,7 @@ struct inode *exofs_iget(struct super_block *sb, unsigned long ino) · 1164 unmodified lines
11651165 inode->i_mode = le16_to_cpu(fcb.i_mode);
11661166 inode->i_uid = le32_to_cpu(fcb.i_uid);
11671167 inode->i_gid = le32_to_cpu(fcb.i_gid);
1168− inode->i_nlink = le16_to_cpu(fcb.i_links_count);
1168+ set_nlink(inode, le16_to_cpu(fcb.i_links_count));
11691169 inode->i_ctime.tv_sec = (signed)le32_to_cpu(fcb.i_ctime);
11701170 inode->i_atime.tv_sec = (signed)le32_to_cpu(fcb.i_atime);
11711171 inode->i_mtime.tv_sec = (signed)le32_to_cpu(fcb.i_mtime);
fs/ext2/inode.c+1−1
@@ -1321,7 +1321,7 @@ struct inode *ext2_iget (struct super_block *sb, unsigned long ino) · 1320 unmodified lines
13211321 inode->i_uid |= le16_to_cpu(raw_inode->i_uid_high) << 16;
13221322 inode->i_gid |= le16_to_cpu(raw_inode->i_gid_high) << 16;
13231323 }
1324− inode->i_nlink = le16_to_cpu(raw_inode->i_links_count);
1324+ set_nlink(inode, le16_to_cpu(raw_inode->i_links_count));
13251325 inode->i_size = le32_to_cpu(raw_inode->i_size);
13261326 inode->i_atime.tv_sec = (signed)le32_to_cpu(raw_inode->i_atime);
13271327 inode->i_ctime.tv_sec = (signed)le32_to_cpu(raw_inode->i_ctime);
fs/ext3/inode.c+1−1
@@ -2899,7 +2899,7 @@ struct inode *ext3_iget(struct super_block *sb, unsigned long ino) · 2898 unmodified lines
28992899 inode->i_uid |= le16_to_cpu(raw_inode->i_uid_high) << 16;
29002900 inode->i_gid |= le16_to_cpu(raw_inode->i_gid_high) << 16;
29012901 }
2902− inode->i_nlink = le16_to_cpu(raw_inode->i_links_count);
2902+ set_nlink(inode, le16_to_cpu(raw_inode->i_links_count));
29032903 inode->i_size = le32_to_cpu(raw_inode->i_size);
29042904 inode->i_atime.tv_sec = (signed)le32_to_cpu(raw_inode->i_atime);
29052905 inode->i_ctime.tv_sec = (signed)le32_to_cpu(raw_inode->i_ctime);
fs/ext3/namei.c+2−2
@@ -1821,7 +1821,7 @@ retry: · 1820 unmodified lines
18211821 de->name_len = 2;
18221822 strcpy (de->name, "..");
18231823 ext3_set_de_type(dir->i_sb, de, S_IFDIR);
1824− inode->i_nlink = 2;
1824+ set_nlink(inode, 2);
18251825 BUFFER_TRACE(dir_block, "call ext3_journal_dirty_metadata");
18261826 err = ext3_journal_dirty_metadata(handle, dir_block);
18271827 if (err)
@@ -2170,7 +2170,7 @@ static int ext3_unlink(struct inode * dir, struct dentry *dentry) · 342 unmodified lines
21702170 ext3_warning (inode->i_sb, "ext3_unlink",
21712171 "Deleting nonexistent file (%lu), %d",
21722172 inode->i_ino, inode->i_nlink);
2173− inode->i_nlink = 1;
2173+ set_nlink(inode, 1);
21742174 }
21752175 retval = ext3_delete_entry(handle, dir, de, bh);
21762176 if (retval)
fs/ext4/inode.c+1−1
@@ -3418,7 +3418,7 @@ struct inode *ext4_iget(struct super_block *sb, unsigned long ino) · 3417 unmodified lines
34183418 inode->i_uid |= le16_to_cpu(raw_inode->i_uid_high) << 16;
34193419 inode->i_gid |= le16_to_cpu(raw_inode->i_gid_high) << 16;
34203420 }
3421− inode->i_nlink = le16_to_cpu(raw_inode->i_links_count);
3421+ set_nlink(inode, le16_to_cpu(raw_inode->i_links_count));
34223422
34233423 ext4_clear_state_flags(ei); /* Only relevant on 32-bit archs */
34243424 ei->i_dir_start_lookup = 0;
fs/ext4/namei.c+3−3
@@ -1694,7 +1694,7 @@ static void ext4_inc_count(handle_t *handle, struct inode *inode) · 1693 unmodified lines
16941694 if (is_dx(inode) && inode->i_nlink > 1) {
16951695 /* limit is 16-bit i_links_count */
16961696 if (inode->i_nlink >= EXT4_LINK_MAX || inode->i_nlink == 2) {
1697− inode->i_nlink = 1;
1697+ set_nlink(inode, 1);
16981698 EXT4_SET_RO_COMPAT_FEATURE(inode->i_sb,
16991699 EXT4_FEATURE_RO_COMPAT_DIR_NLINK);
17001700 }
@@ -1861,7 +1861,7 @@ retry: · 160 unmodified lines
18611861 de->name_len = 2;
18621862 strcpy(de->name, "..");
18631863 ext4_set_de_type(dir->i_sb, de, S_IFDIR);
1864− inode->i_nlink = 2;
1864+ set_nlink(inode, 2);
18651865 BUFFER_TRACE(dir_block, "call ext4_handle_dirty_metadata");
18661866 err = ext4_handle_dirty_metadata(handle, dir, dir_block);
18671867 if (err)
@@ -2214,7 +2214,7 @@ static int ext4_unlink(struct inode *dir, struct dentry *dentry) · 346 unmodified lines
22142214 ext4_warning(inode->i_sb,
22152215 "Deleting nonexistent file (%lu), %d",
22162216 inode->i_ino, inode->i_nlink);
2217− inode->i_nlink = 1;
2217+ set_nlink(inode, 1);
22182218 }
22192219 retval = ext4_delete_entry(handle, dir, de, bh);
22202220 if (retval)
fs/fat/inode.c+2−2
@@ -379,7 +379,7 @@ static int fat_fill_inode(struct inode *inode, struct msdos_dir_entry *de) · 378 unmodified lines
379379 return error;
380380 MSDOS_I(inode)->mmu_private = inode->i_size;
381381
382− inode->i_nlink = fat_subdirs(inode);
382+ set_nlink(inode, fat_subdirs(inode));
383383 } else { /* not a directory */
384384 inode->i_generation |= 1;
385385 inode->i_mode = fat_make_mode(sbi, de->attr,
@@ -1233,7 +1233,7 @@ static int fat_read_root(struct inode *inode) · 847 unmodified lines
12331233 fat_save_attrs(inode, ATTR_DIR);
12341234 inode->i_mtime.tv_sec = inode->i_atime.tv_sec = inode->i_ctime.tv_sec = 0;
12351235 inode->i_mtime.tv_nsec = inode->i_atime.tv_nsec = inode->i_ctime.tv_nsec = 0;
1236− inode->i_nlink = fat_subdirs(inode)+2;
1236+ set_nlink(inode, fat_subdirs(inode)+2);
12371237
12381238 return 0;
12391239 }
fs/fat/namei_msdos.c+1−1
@@ -387,7 +387,7 @@ static int msdos_mkdir(struct inode *dir, struct dentry *dentry, int mode) · 386 unmodified lines
387387 /* the directory was completed, just return a error */
388388 goto out;
389389 }
390− inode->i_nlink = 2;
390+ set_nlink(inode, 2);
391391 inode->i_mtime = inode->i_atime = inode->i_ctime = ts;
392392 /* timestamp is already written, so mark_inode_dirty() is unneeded. */
393393
fs/fat/namei_vfat.c+1−1
@@ -900,7 +900,7 @@ static int vfat_mkdir(struct inode *dir, struct dentry *dentry, int mode) · 899 unmodified lines
900900 goto out;
901901 }
902902 inode->i_version++;
903− inode->i_nlink = 2;
903+ set_nlink(inode, 2);
904904 inode->i_mtime = inode->i_atime = inode->i_ctime = ts;
905905 /* timestamp is already written, so mark_inode_dirty() is unneeded. */
906906
fs/freevxfs/vxfs_inode.c+1−1
@@ -227,7 +227,7 @@ vxfs_iinit(struct inode *ip, struct vxfs_inode_info *vip) · 226 unmodified lines
227227 ip->i_uid = (uid_t)vip->vii_uid;
228228 ip->i_gid = (gid_t)vip->vii_gid;
229229
230− ip->i_nlink = vip->vii_nlink;
230+ set_nlink(ip, vip->vii_nlink);
231231 ip->i_size = vip->vii_size;
232232
233233 ip->i_atime.tv_sec = vip->vii_atime;
fs/fuse/control.c+1−1
@@ -231,7 +231,7 @@ static struct dentry *fuse_ctl_add_dentry(struct dentry *parent, · 230 unmodified lines
231231 if (iop)
232232 inode->i_op = iop;
233233 inode->i_fop = fop;
234− inode->i_nlink = nlink;
234+ set_nlink(inode, nlink);
235235 inode->i_private = fc;
236236 d_add(dentry, inode);
237237 return dentry;
fs/fuse/inode.c+1−1
@@ -151,7 +151,7 @@ void fuse_change_attributes_common(struct inode *inode, struct fuse_attr *attr, · 150 unmodified lines
151151
152152 inode->i_ino = attr->ino;
153153 inode->i_mode = (inode->i_mode & S_IFMT) | (attr->mode & 07777);
154− inode->i_nlink = attr->nlink;
154+ set_nlink(inode, attr->nlink);
155155 inode->i_uid = attr->uid;
156156 inode->i_gid = attr->gid;
157157 inode->i_blocks = attr->blocks;
fs/gfs2/glops.c+1−1
@@ -299,7 +299,7 @@ static void gfs2_set_nlink(struct inode *inode, u32 nlink) · 298 unmodified lines
299299 if (nlink == 0)
300300 clear_nlink(inode);
301301 else
302− inode->i_nlink = nlink;
302+ set_nlink(inode, nlink);
303303 }
304304 }
305305
fs/hfs/inode.c+2−2
@@ -183,7 +183,7 @@ struct inode *hfs_new_inode(struct inode *dir, struct qstr *name, int mode) · 182 unmodified lines
183183 inode->i_mode = mode;
184184 inode->i_uid = current_fsuid();
185185 inode->i_gid = current_fsgid();
186− inode->i_nlink = 1;
186+ set_nlink(inode, 1);
187187 inode->i_mtime = inode->i_atime = inode->i_ctime = CURRENT_TIME_SEC;
188188 HFS_I(inode)->flags = 0;
189189 HFS_I(inode)->rsrc_inode = NULL;
@@ -313,7 +313,7 @@ static int hfs_read_inode(struct inode *inode, void *data) · 123 unmodified lines
313313 /* Initialize the inode */
314314 inode->i_uid = hsb->s_uid;
315315 inode->i_gid = hsb->s_gid;
316− inode->i_nlink = 1;
316+ set_nlink(inode, 1);
317317
318318 if (idata->key)
319319 HFS_I(inode)->cat_key = *idata->key;
fs/hfsplus/inode.c+5−5
@@ -391,7 +391,7 @@ struct inode *hfsplus_new_inode(struct super_block *sb, int mode) · 390 unmodified lines
391391 inode->i_mode = mode;
392392 inode->i_uid = current_fsuid();
393393 inode->i_gid = current_fsgid();
394− inode->i_nlink = 1;
394+ set_nlink(inode, 1);
395395 inode->i_mtime = inode->i_atime = inode->i_ctime = CURRENT_TIME_SEC;
396396
397397 hip = HFSPLUS_I(inode);
@@ -512,7 +512,7 @@ int hfsplus_cat_read_inode(struct inode *inode, struct hfs_find_data *fd) · 114 unmodified lines
512512 hfs_bnode_read(fd->bnode, &entry, fd->entryoffset,
513513 sizeof(struct hfsplus_cat_folder));
514514 hfsplus_get_perms(inode, &folder->permissions, 1);
515− inode->i_nlink = 1;
515+ set_nlink(inode, 1);
516516 inode->i_size = 2 + be32_to_cpu(folder->valence);
517517 inode->i_atime = hfsp_mt2ut(folder->access_date);
518518 inode->i_mtime = hfsp_mt2ut(folder->content_mod_date);
@@ -532,11 +532,11 @@ int hfsplus_cat_read_inode(struct inode *inode, struct hfs_find_data *fd) · 13 unmodified lines
532532 hfsplus_inode_read_fork(inode, HFSPLUS_IS_RSRC(inode) ?
533533 &file->rsrc_fork : &file->data_fork);
534534 hfsplus_get_perms(inode, &file->permissions, 0);
535− inode->i_nlink = 1;
535+ set_nlink(inode, 1);
536536 if (S_ISREG(inode->i_mode)) {
537537 if (file->permissions.dev)
538− inode->i_nlink =
539− be32_to_cpu(file->permissions.dev);
538+ set_nlink(inode,
539+ be32_to_cpu(file->permissions.dev));
540540 inode->i_op = &hfsplus_file_inode_operations;
541541 inode->i_fop = &hfsplus_file_operations;
542542 inode->i_mapping->a_ops = &hfsplus_aops;
fs/hostfs/hostfs_kern.c+1−1
@@ -541,7 +541,7 @@ static int read_name(struct inode *ino, char *name) · 540 unmodified lines
541541
542542 ino->i_ino = st.ino;
543543 ino->i_mode = st.mode;
544− ino->i_nlink = st.nlink;
544+ set_nlink(ino, st.nlink);
545545 ino->i_uid = st.uid;
546546 ino->i_gid = st.gid;
547547 ino->i_atime = st.atime;
fs/hpfs/dir.c+1−1
@@ -247,7 +247,7 @@ struct dentry *hpfs_lookup(struct inode *dir, struct dentry *dentry, struct name · 246 unmodified lines
247247 result->i_mode &= ~0111;
248248 result->i_op = &hpfs_file_iops;
249249 result->i_fop = &hpfs_file_ops;
250− result->i_nlink = 1;
250+ set_nlink(result, 1);
251251 }
252252 unlock_new_inode(result);
253253 }
fs/hpfs/inode.c+4−4
@@ -77,7 +77,7 @@ void hpfs_read_inode(struct inode *i) · 76 unmodified lines
7777 i->i_mode = S_IFLNK | 0777;
7878 i->i_op = &page_symlink_inode_operations;
7979 i->i_data.a_ops = &hpfs_symlink_aops;
80− i->i_nlink = 1;
80+ set_nlink(i, 1);
8181 i->i_size = ea_size;
8282 i->i_blocks = 1;
8383 brelse(bh);
@@ -101,7 +101,7 @@ void hpfs_read_inode(struct inode *i) · 17 unmodified lines
101101 }
102102 if (S_ISBLK(mode) || S_ISCHR(mode) || S_ISFIFO(mode) || S_ISSOCK(mode)) {
103103 brelse(bh);
104− i->i_nlink = 1;
104+ set_nlink(i, 1);
105105 i->i_size = 0;
106106 i->i_blocks = 1;
107107 init_special_inode(i, mode,
@@ -125,13 +125,13 @@ void hpfs_read_inode(struct inode *i) · 17 unmodified lines
125125 hpfs_count_dnodes(i->i_sb, hpfs_inode->i_dno, &n_dnodes, &n_subdirs, NULL);
126126 i->i_blocks = 4 * n_dnodes;
127127 i->i_size = 2048 * n_dnodes;
128− i->i_nlink = 2 + n_subdirs;
128+ set_nlink(i, 2 + n_subdirs);
129129 } else {
130130 i->i_mode |= S_IFREG;
131131 if (!hpfs_inode->i_ea_mode) i->i_mode &= ~0111;
132132 i->i_op = &hpfs_file_iops;
133133 i->i_fop = &hpfs_file_ops;
134− i->i_nlink = 1;
134+ set_nlink(i, 1);
135135 i->i_size = le32_to_cpu(fnode->file_size);
136136 i->i_blocks = ((i->i_size + 511) >> 9) + 1;
137137 i->i_data.a_ops = &hpfs_aops;
fs/hpfs/namei.c+4−4
@@ -56,7 +56,7 @@ static int hpfs_mkdir(struct inode *dir, struct dentry *dentry, int mode) · 55 unmodified lines
5656 result->i_fop = &hpfs_dir_ops;
5757 result->i_blocks = 4;
5858 result->i_size = 2048;
59− result->i_nlink = 2;
59+ set_nlink(result, 2);
6060 if (dee.read_only)
6161 result->i_mode &= ~0222;
6262
@@ -150,7 +150,7 @@ static int hpfs_create(struct inode *dir, struct dentry *dentry, int mode, struc · 87 unmodified lines
150150 result->i_mode &= ~0111;
151151 result->i_op = &hpfs_file_iops;
152152 result->i_fop = &hpfs_file_ops;
153− result->i_nlink = 1;
153+ set_nlink(result, 1);
154154 hpfs_i(result)->i_parent_dir = dir->i_ino;
155155 result->i_ctime.tv_sec = result->i_mtime.tv_sec = result->i_atime.tv_sec = local_to_gmt(dir->i_sb, le32_to_cpu(dee.creation_date));
156156 result->i_ctime.tv_nsec = 0;
@@ -242,7 +242,7 @@ static int hpfs_mknod(struct inode *dir, struct dentry *dentry, int mode, dev_t · 85 unmodified lines
242242 hpfs_i(result)->i_ea_size = 0;
243243 result->i_uid = current_fsuid();
244244 result->i_gid = current_fsgid();
245− result->i_nlink = 1;
245+ set_nlink(result, 1);
246246 result->i_size = 0;
247247 result->i_blocks = 1;
248248 init_special_inode(result, mode, rdev);
@@ -318,7 +318,7 @@ static int hpfs_symlink(struct inode *dir, struct dentry *dentry, const char *sy · 69 unmodified lines
318318 result->i_uid = current_fsuid();
319319 result->i_gid = current_fsgid();
320320 result->i_blocks = 1;
321− result->i_nlink = 1;
321+ set_nlink(result, 1);
322322 result->i_size = strlen(symlink);
323323 result->i_op = &page_symlink_inode_operations;
324324 result->i_data.a_ops = &hpfs_symlink_aops;
fs/hppfs/hppfs.c+1−1
@@ -702,7 +702,7 @@ static struct inode *get_inode(struct super_block *sb, struct dentry *dentry) · 701 unmodified lines
702702 inode->i_ctime = proc_ino->i_ctime;
703703 inode->i_ino = proc_ino->i_ino;
704704 inode->i_mode = proc_ino->i_mode;
705− inode->i_nlink = proc_ino->i_nlink;
705+ set_nlink(inode, proc_ino->i_nlink);
706706 inode->i_size = proc_ino->i_size;
707707 inode->i_blocks = proc_ino->i_blocks;
708708
fs/isofs/inode.c+2−2
@@ -1319,7 +1319,7 @@ static int isofs_read_inode(struct inode *inode) · 1318 unmodified lines
13191319 inode->i_mode = S_IFDIR | sbi->s_dmode;
13201320 else
13211321 inode->i_mode = S_IFDIR | S_IRUGO | S_IXUGO;
1322− inode->i_nlink = 1; /*
1322+ set_nlink(inode, 1); /*
13231323 * Set to 1. We know there are 2, but
13241324 * the find utility tries to optimize
13251325 * if it is 2, and it screws up. It is
@@ -1337,7 +1337,7 @@ static int isofs_read_inode(struct inode *inode) · 11 unmodified lines
13371337 */
13381338 inode->i_mode = S_IFREG | S_IRUGO | S_IXUGO;
13391339 }
1340− inode->i_nlink = 1;
1340+ set_nlink(inode, 1);
13411341 }
13421342 inode->i_uid = sbi->s_uid;
13431343 inode->i_gid = sbi->s_gid;
fs/isofs/rock.c+2−2
@@ -363,7 +363,7 @@ repeat: · 362 unmodified lines
363363 break;
364364 case SIG('P', 'X'):
365365 inode->i_mode = isonum_733(rr->u.PX.mode);
366− inode->i_nlink = isonum_733(rr->u.PX.n_links);
366+ set_nlink(inode, isonum_733(rr->u.PX.n_links));
367367 inode->i_uid = isonum_733(rr->u.PX.uid);
368368 inode->i_gid = isonum_733(rr->u.PX.gid);
369369 break;
@@ -496,7 +496,7 @@ repeat: · 126 unmodified lines
496496 goto out;
497497 }
498498 inode->i_mode = reloc->i_mode;
499− inode->i_nlink = reloc->i_nlink;
499+ set_nlink(inode, reloc->i_nlink);
500500 inode->i_uid = reloc->i_uid;
501501 inode->i_gid = reloc->i_gid;
502502 inode->i_rdev = reloc->i_rdev;
fs/jffs2/dir.c+3−3
@@ -245,7 +245,7 @@ static int jffs2_unlink(struct inode *dir_i, struct dentry *dentry) · 244 unmodified lines
245245 ret = jffs2_do_unlink(c, dir_f, dentry->d_name.name,
246246 dentry->d_name.len, dead_f, now);
247247 if (dead_f->inocache)
248− dentry->d_inode->i_nlink = dead_f->inocache->pino_nlink;
248+ set_nlink(dentry->d_inode, dead_f->inocache->pino_nlink);
249249 if (!ret)
250250 dir_i->i_mtime = dir_i->i_ctime = ITIME(now);
251251 return ret;
@@ -278,7 +278,7 @@ static int jffs2_link (struct dentry *old_dentry, struct inode *dir_i, struct de · 26 unmodified lines
278278
279279 if (!ret) {
280280 mutex_lock(&f->sem);
281− old_dentry->d_inode->i_nlink = ++f->inocache->pino_nlink;
281+ set_nlink(old_dentry->d_inode, ++f->inocache->pino_nlink);
282282 mutex_unlock(&f->sem);
283283 d_instantiate(dentry, old_dentry->d_inode);
284284 dir_i->i_mtime = dir_i->i_ctime = ITIME(now);
@@ -497,7 +497,7 @@ static int jffs2_mkdir (struct inode *dir_i, struct dentry *dentry, int mode) · 212 unmodified lines
497497 f = JFFS2_INODE_INFO(inode);
498498
499499 /* Directories get nlink 2 at start */
500− inode->i_nlink = 2;
500+ set_nlink(inode, 2);
501501 /* but ic->pino_nlink is the parent ino# */
502502 f->inocache->pino_nlink = dir_i->i_ino;
503503
fs/jffs2/fs.c+3−3
@@ -278,7 +278,7 @@ struct inode *jffs2_iget(struct super_block *sb, unsigned long ino) · 277 unmodified lines
278278 inode->i_mtime = ITIME(je32_to_cpu(latest_node.mtime));
279279 inode->i_ctime = ITIME(je32_to_cpu(latest_node.ctime));
280280
281− inode->i_nlink = f->inocache->pino_nlink;
281+ set_nlink(inode, f->inocache->pino_nlink);
282282
283283 inode->i_blocks = (inode->i_size + 511) >> 9;
284284
@@ -291,7 +291,7 @@ struct inode *jffs2_iget(struct super_block *sb, unsigned long ino) · 6 unmodified lines
291291 case S_IFDIR:
292292 {
293293 struct jffs2_full_dirent *fd;
294− inode->i_nlink = 2; /* parent and '.' */
294+ set_nlink(inode, 2); /* parent and '.' */
295295
296296 for (fd=f->dents; fd; fd = fd->next) {
297297 if (fd->type == DT_DIR && fd->ino)
@@ -453,7 +453,7 @@ struct inode *jffs2_new_inode (struct inode *dir_i, umode_t mode, struct jffs2_r · 155 unmodified lines
453453 iput(inode);
454454 return ERR_PTR(ret);
455455 }
456− inode->i_nlink = 1;
456+ set_nlink(inode, 1);
457457 inode->i_ino = je32_to_cpu(ri->ino);
458458 inode->i_mode = jemode_to_cpu(ri->mode);
459459 inode->i_gid = je16_to_cpu(ri->gid);
fs/jfs/jfs_imap.c+3−3
@@ -457,7 +457,7 @@ struct inode *diReadSpecial(struct super_block *sb, ino_t inum, int secondary) · 456 unmodified lines
457457 /* read the page of fixed disk inode (AIT) in raw mode */
458458 mp = read_metapage(ip, address << sbi->l2nbperpage, PSIZE, 1);
459459 if (mp == NULL) {
460− ip->i_nlink = 1; /* Don't want iput() deleting it */
460+ set_nlink(ip, 1); /* Don't want iput() deleting it */
461461 iput(ip);
462462 return (NULL);
463463 }
@@ -469,7 +469,7 @@ struct inode *diReadSpecial(struct super_block *sb, ino_t inum, int secondary) · 5 unmodified lines
469469 /* copy on-disk inode to in-memory inode */
470470 if ((copy_from_dinode(dp, ip)) != 0) {
471471 /* handle bad return by returning NULL for ip */
472− ip->i_nlink = 1; /* Don't want iput() deleting it */
472+ set_nlink(ip, 1); /* Don't want iput() deleting it */
473473 iput(ip);
474474 /* release the page */
475475 release_metapage(mp);
@@ -3076,7 +3076,7 @@ static int copy_from_dinode(struct dinode * dip, struct inode *ip) · 2600 unmodified lines
30763076 ip->i_mode |= 0001;
30773077 }
30783078 }
3079− ip->i_nlink = le32_to_cpu(dip->di_nlink);
3079+ set_nlink(ip, le32_to_cpu(dip->di_nlink));
30803080
30813081 jfs_ip->saved_uid = le32_to_cpu(dip->di_uid);
30823082 if (sbi->uid == -1)
fs/jfs/namei.c+1−1
@@ -292,7 +292,7 @@ static int jfs_mkdir(struct inode *dip, struct dentry *dentry, int mode) · 291 unmodified lines
292292 goto out3;
293293 }
294294
295− ip->i_nlink = 2; /* for '.' */
295+ set_nlink(ip, 2); /* for '.' */
296296 ip->i_op = &jfs_dir_inode_operations;
297297 ip->i_fop = &jfs_dir_operations;
298298
fs/libfs.c+1−1
@@ -490,7 +490,7 @@ int simple_fill_super(struct super_block *s, unsigned long magic, · 489 unmodified lines
490490 inode->i_atime = inode->i_mtime = inode->i_ctime = CURRENT_TIME;
491491 inode->i_op = &simple_dir_inode_operations;
492492 inode->i_fop = &simple_dir_operations;
493− inode->i_nlink = 2;
493+ set_nlink(inode, 2);
494494 root = d_alloc_root(inode);
495495 if (!root) {
496496 iput(inode);
fs/logfs/readwrite.c+1−1
@@ -126,7 +126,7 @@ static void logfs_disk_to_inode(struct logfs_disk_inode *di, struct inode*inode) · 125 unmodified lines
126126 inode->i_atime = be64_to_timespec(di->di_atime);
127127 inode->i_ctime = be64_to_timespec(di->di_ctime);
128128 inode->i_mtime = be64_to_timespec(di->di_mtime);
129− inode->i_nlink = be32_to_cpu(di->di_refcount);
129+ set_nlink(inode, be32_to_cpu(di->di_refcount));
130130 inode->i_generation = be32_to_cpu(di->di_generation);
131131
132132 switch (inode->i_mode & S_IFMT) {
fs/minix/inode.c+2−2
@@ -446,7 +446,7 @@ static struct inode *V1_minix_iget(struct inode *inode) · 445 unmodified lines
446446 inode->i_mode = raw_inode->i_mode;
447447 inode->i_uid = (uid_t)raw_inode->i_uid;
448448 inode->i_gid = (gid_t)raw_inode->i_gid;
449− inode->i_nlink = raw_inode->i_nlinks;
449+ set_nlink(inode, raw_inode->i_nlinks);
450450 inode->i_size = raw_inode->i_size;
451451 inode->i_mtime.tv_sec = inode->i_atime.tv_sec = inode->i_ctime.tv_sec = raw_inode->i_time;
452452 inode->i_mtime.tv_nsec = 0;
@@ -479,7 +479,7 @@ static struct inode *V2_minix_iget(struct inode *inode) · 26 unmodified lines
479479 inode->i_mode = raw_inode->i_mode;
480480 inode->i_uid = (uid_t)raw_inode->i_uid;
481481 inode->i_gid = (gid_t)raw_inode->i_gid;
482− inode->i_nlink = raw_inode->i_nlinks;
482+ set_nlink(inode, raw_inode->i_nlinks);
483483 inode->i_size = raw_inode->i_size;
484484 inode->i_mtime.tv_sec = raw_inode->i_mtime;
485485 inode->i_atime.tv_sec = raw_inode->i_atime;
fs/ncpfs/inode.c+1−1
@@ -228,7 +228,7 @@ static void ncp_set_attr(struct inode *inode, struct ncp_entry_info *nwinfo) · 227 unmodified lines
228228
229229 DDPRINTK("ncp_read_inode: inode->i_mode = %u\n", inode->i_mode);
230230
231− inode->i_nlink = 1;
231+ set_nlink(inode, 1);
232232 inode->i_uid = server->m.uid;
233233 inode->i_gid = server->m.gid;
234234
fs/nfs/inode.c+2−2
@@ -355,7 +355,7 @@ nfs_fhget(struct super_block *sb, struct nfs_fh *fh, struct nfs_fattr *fattr) · 354 unmodified lines
355355 | NFS_INO_INVALID_DATA
356356 | NFS_INO_REVAL_PAGECACHE;
357357 if (fattr->valid & NFS_ATTR_FATTR_NLINK)
358− inode->i_nlink = fattr->nlink;
358+ set_nlink(inode, fattr->nlink);
359359 else if (nfs_server_capable(inode, NFS_CAP_NLINK))
360360 nfsi->cache_validity |= NFS_INO_INVALID_ATTR;
361361 if (fattr->valid & NFS_ATTR_FATTR_OWNER)
@@ -1361,7 +1361,7 @@ static int nfs_update_inode(struct inode *inode, struct nfs_fattr *fattr) · 999 unmodified lines
13611361 invalid |= NFS_INO_INVALID_ATTR;
13621362 if (S_ISDIR(inode->i_mode))
13631363 invalid |= NFS_INO_INVALID_DATA;
1364− inode->i_nlink = fattr->nlink;
1364+ set_nlink(inode, fattr->nlink);
13651365 }
13661366 } else if (server->caps & NFS_CAP_NLINK)
13671367 invalid |= save_cache_validity & (NFS_INO_INVALID_ATTR
fs/nilfs2/inode.c+1−1
@@ -396,7 +396,7 @@ int nilfs_read_inode_common(struct inode *inode, · 395 unmodified lines
396396 inode->i_mode = le16_to_cpu(raw_inode->i_mode);
397397 inode->i_uid = (uid_t)le32_to_cpu(raw_inode->i_uid);
398398 inode->i_gid = (gid_t)le32_to_cpu(raw_inode->i_gid);
399− inode->i_nlink = le16_to_cpu(raw_inode->i_links_count);
399+ set_nlink(inode, le16_to_cpu(raw_inode->i_links_count));
400400 inode->i_size = le64_to_cpu(raw_inode->i_size);
401401 inode->i_atime.tv_sec = le64_to_cpu(raw_inode->i_mtime);
402402 inode->i_ctime.tv_sec = le64_to_cpu(raw_inode->i_ctime);
fs/nilfs2/namei.c+1−1
@@ -289,7 +289,7 @@ static int nilfs_do_unlink(struct inode *dir, struct dentry *dentry) · 288 unmodified lines
289289 nilfs_warning(inode->i_sb, __func__,
290290 "deleting nonexistent file (%lu), %d\n",
291291 inode->i_ino, inode->i_nlink);
292− inode->i_nlink = 1;
292+ set_nlink(inode, 1);
293293 }
294294 err = nilfs_delete_entry(de, page);
295295 if (err)
fs/ntfs/inode.c+4−4
@@ -612,7 +612,7 @@ static int ntfs_read_locked_inode(struct inode *vi) · 611 unmodified lines
612612 * might be tricky due to vfs interactions. Need to think about this
613613 * some more when implementing the unlink command.
614614 */
615− vi->i_nlink = le16_to_cpu(m->link_count);
615+ set_nlink(vi, le16_to_cpu(m->link_count));
616616 /*
617617 * FIXME: Reparse points can have the directory bit set even though
618618 * they would be S_IFLNK. Need to deal with this further below when we
@@ -634,7 +634,7 @@ static int ntfs_read_locked_inode(struct inode *vi) · 15 unmodified lines
634634 vi->i_mode &= ~vol->dmask;
635635 /* Things break without this kludge! */
636636 if (vi->i_nlink > 1)
637− vi->i_nlink = 1;
637+ set_nlink(vi, 1);
638638 } else {
639639 vi->i_mode |= S_IFREG;
640640 /* Apply the file permissions mask set in the mount options. */
@@ -1242,7 +1242,7 @@ static int ntfs_read_locked_attr_inode(struct inode *base_vi, struct inode *vi) · 601 unmodified lines
12421242 vi->i_version = base_vi->i_version;
12431243 vi->i_uid = base_vi->i_uid;
12441244 vi->i_gid = base_vi->i_gid;
1245− vi->i_nlink = base_vi->i_nlink;
1245+ set_nlink(vi, base_vi->i_nlink);
12461246 vi->i_mtime = base_vi->i_mtime;
12471247 vi->i_ctime = base_vi->i_ctime;
12481248 vi->i_atime = base_vi->i_atime;
@@ -1508,7 +1508,7 @@ static int ntfs_read_locked_index_inode(struct inode *base_vi, struct inode *vi) · 259 unmodified lines
15081508 vi->i_version = base_vi->i_version;
15091509 vi->i_uid = base_vi->i_uid;
15101510 vi->i_gid = base_vi->i_gid;
1511− vi->i_nlink = base_vi->i_nlink;
1511+ set_nlink(vi, base_vi->i_nlink);
15121512 vi->i_mtime = base_vi->i_mtime;
15131513 vi->i_ctime = base_vi->i_ctime;
15141514 vi->i_atime = base_vi->i_atime;
fs/ocfs2/dir.c+2−2
@@ -2292,7 +2292,7 @@ static int ocfs2_fill_new_dir_id(struct ocfs2_super *osb, · 2291 unmodified lines
22922292 ocfs2_journal_dirty(handle, di_bh);
22932293
22942294 i_size_write(inode, size);
2295− inode->i_nlink = 2;
2295+ set_nlink(inode, 2);
22962296 inode->i_blocks = ocfs2_inode_sector_count(inode);
22972297
22982298 ret = ocfs2_mark_inode_dirty(handle, inode, di_bh);
@@ -2354,7 +2354,7 @@ static int ocfs2_fill_new_dir_el(struct ocfs2_super *osb, · 55 unmodified lines
23542354 ocfs2_journal_dirty(handle, new_bh);
23552355
23562356 i_size_write(inode, inode->i_sb->s_blocksize);
2357− inode->i_nlink = 2;
2357+ set_nlink(inode, 2);
23582358 inode->i_blocks = ocfs2_inode_sector_count(inode);
23592359 status = ocfs2_mark_inode_dirty(handle, inode, fe_bh);
23602360 if (status < 0) {
fs/ocfs2/dlmglue.c+1−1
@@ -2092,7 +2092,7 @@ static void ocfs2_refresh_inode_from_lvb(struct inode *inode) · 2091 unmodified lines
20922092 inode->i_uid = be32_to_cpu(lvb->lvb_iuid);
20932093 inode->i_gid = be32_to_cpu(lvb->lvb_igid);
20942094 inode->i_mode = be16_to_cpu(lvb->lvb_imode);
2095− inode->i_nlink = be16_to_cpu(lvb->lvb_inlink);
2095+ set_nlink(inode, be16_to_cpu(lvb->lvb_inlink));
20962096 ocfs2_unpack_timespec(&inode->i_atime,
20972097 be64_to_cpu(lvb->lvb_iatime_packed));
20982098 ocfs2_unpack_timespec(&inode->i_mtime,
fs/ocfs2/inode.c+2−2
@@ -291,7 +291,7 @@ void ocfs2_populate_inode(struct inode *inode, struct ocfs2_dinode *fe, · 290 unmodified lines
291291 (unsigned long long)OCFS2_I(inode)->ip_blkno,
292292 (unsigned long long)le64_to_cpu(fe->i_blkno));
293293
294− inode->i_nlink = ocfs2_read_links_count(fe);
294+ set_nlink(inode, ocfs2_read_links_count(fe));
295295
296296 trace_ocfs2_populate_inode(OCFS2_I(inode)->ip_blkno,
297297 le32_to_cpu(fe->i_flags));
@@ -1290,7 +1290,7 @@ void ocfs2_refresh_inode(struct inode *inode, · 992 unmodified lines
12901290 OCFS2_I(inode)->ip_dyn_features = le16_to_cpu(fe->i_dyn_features);
12911291 ocfs2_set_inode_flags(inode);
12921292 i_size_write(inode, le64_to_cpu(fe->i_size));
1293− inode->i_nlink = ocfs2_read_links_count(fe);
1293+ set_nlink(inode, ocfs2_read_links_count(fe));
12941294 inode->i_uid = le32_to_cpu(fe->i_uid);
12951295 inode->i_gid = le32_to_cpu(fe->i_gid);
12961296 inode->i_mode = le16_to_cpu(fe->i_mode);
fs/ocfs2/namei.c+4−4
@@ -199,7 +199,7 @@ static struct inode *ocfs2_get_init_inode(struct inode *dir, int mode) · 198 unmodified lines
199199 * these are used by the support functions here and in
200200 * callers. */
201201 if (S_ISDIR(mode))
202− inode->i_nlink = 2;
202+ set_nlink(inode, 2);
203203 inode_init_owner(inode, dir, mode);
204204 dquot_initialize(inode);
205205 return inode;
@@ -2016,7 +2016,7 @@ static int ocfs2_orphan_add(struct ocfs2_super *osb, · 1810 unmodified lines
20162016 orphan_fe = (struct ocfs2_dinode *) orphan_dir_bh->b_data;
20172017 if (S_ISDIR(inode->i_mode))
20182018 ocfs2_add_links_count(orphan_fe, 1);
2019− orphan_dir_inode->i_nlink = ocfs2_read_links_count(orphan_fe);
2019+ set_nlink(orphan_dir_inode, ocfs2_read_links_count(orphan_fe));
20202020 ocfs2_journal_dirty(handle, orphan_dir_bh);
20212021
20222022 status = __ocfs2_add_entry(handle, orphan_dir_inode, name,
@@ -2114,7 +2114,7 @@ int ocfs2_orphan_del(struct ocfs2_super *osb, · 91 unmodified lines
21142114 orphan_fe = (struct ocfs2_dinode *) orphan_dir_bh->b_data;
21152115 if (S_ISDIR(inode->i_mode))
21162116 ocfs2_add_links_count(orphan_fe, -1);
2117− orphan_dir_inode->i_nlink = ocfs2_read_links_count(orphan_fe);
2117+ set_nlink(orphan_dir_inode, ocfs2_read_links_count(orphan_fe));
21182118 ocfs2_journal_dirty(handle, orphan_dir_bh);
21192119
21202120 leave:
@@ -2435,7 +2435,7 @@ int ocfs2_mv_orphaned_inode_to_new(struct inode *dir, · 314 unmodified lines
24352435 di = (struct ocfs2_dinode *)di_bh->b_data;
24362436 le32_add_cpu(&di->i_flags, -OCFS2_ORPHANED_FL);
24372437 di->i_orphaned_slot = 0;
2438− inode->i_nlink = 1;
2438+ set_nlink(inode, 1);
24392439 ocfs2_set_links_count(di, inode->i_nlink);
24402440 ocfs2_journal_dirty(handle, di_bh);
24412441
fs/openpromfs/inode.c+2−2
@@ -242,7 +242,7 @@ found: · 241 unmodified lines
242242 inode->i_mode = S_IFDIR | S_IRUGO | S_IXUGO;
243243 inode->i_op = &openprom_inode_operations;
244244 inode->i_fop = &openprom_operations;
245− inode->i_nlink = 2;
245+ set_nlink(inode, 2);
246246 break;
247247 case op_inode_prop:
248248 if (!strcmp(dp->name, "options") && (len == 17) &&
@@ -251,7 +251,7 @@ found: · 2 unmodified lines
251251 else
252252 inode->i_mode = S_IFREG | S_IRUGO;
253253 inode->i_fop = &openpromfs_prop_ops;
254− inode->i_nlink = 1;
254+ set_nlink(inode, 1);
255255 inode->i_size = ent_oi->u.prop->length;
256256 break;
257257 }
fs/proc/base.c+6−6
@@ -2248,7 +2248,7 @@ static struct dentry *proc_pident_instantiate(struct inode *dir, · 2247 unmodified lines
22482248 ei = PROC_I(inode);
22492249 inode->i_mode = p->mode;
22502250 if (S_ISDIR(inode->i_mode))
2251− inode->i_nlink = 2; /* Use getattr to fix if necessary */
2251+ set_nlink(inode, 2); /* Use getattr to fix if necessary */
22522252 if (p->iop)
22532253 inode->i_op = p->iop;
22542254 if (p->fop)
@@ -2642,7 +2642,7 @@ static struct dentry *proc_base_instantiate(struct inode *dir, · 387 unmodified lines
26422642
26432643 inode->i_mode = p->mode;
26442644 if (S_ISDIR(inode->i_mode))
2645− inode->i_nlink = 2;
2645+ set_nlink(inode, 2);
26462646 if (S_ISLNK(inode->i_mode))
26472647 inode->i_size = 64;
26482648 if (p->iop)
@@ -2981,8 +2981,8 @@ static struct dentry *proc_pid_instantiate(struct inode *dir, · 332 unmodified lines
29812981 inode->i_fop = &proc_tgid_base_operations;
29822982 inode->i_flags|=S_IMMUTABLE;
29832983
2984− inode->i_nlink = 2 + pid_entry_count_dirs(tgid_base_stuff,
2985− ARRAY_SIZE(tgid_base_stuff));
2984+ set_nlink(inode, 2 + pid_entry_count_dirs(tgid_base_stuff,
2985+ ARRAY_SIZE(tgid_base_stuff)));
29862986
29872987 d_set_d_op(dentry, &pid_dentry_operations);
29882988
@@ -3233,8 +3233,8 @@ static struct dentry *proc_task_instantiate(struct inode *dir, · 244 unmodified lines
32333233 inode->i_fop = &proc_tid_base_operations;
32343234 inode->i_flags|=S_IMMUTABLE;
32353235
3236− inode->i_nlink = 2 + pid_entry_count_dirs(tid_base_stuff,
3237− ARRAY_SIZE(tid_base_stuff));
3236+ set_nlink(inode, 2 + pid_entry_count_dirs(tid_base_stuff,
3237+ ARRAY_SIZE(tid_base_stuff)));
32383238
32393239 d_set_d_op(dentry, &pid_dentry_operations);
32403240
fs/proc/generic.c+1−1
@@ -283,7 +283,7 @@ static int proc_getattr(struct vfsmount *mnt, struct dentry *dentry, · 282 unmodified lines
283283 struct inode *inode = dentry->d_inode;
284284 struct proc_dir_entry *de = PROC_I(inode)->pde;
285285 if (de && de->nlink)
286− inode->i_nlink = de->nlink;
286+ set_nlink(inode, de->nlink);
287287
288288 generic_fillattr(inode, stat);
289289 return 0;
fs/proc/inode.c+1−1
@@ -445,7 +445,7 @@ struct inode *proc_get_inode(struct super_block *sb, struct proc_dir_entry *de) · 444 unmodified lines
445445 if (de->size)
446446 inode->i_size = de->size;
447447 if (de->nlink)
448− inode->i_nlink = de->nlink;
448+ set_nlink(inode, de->nlink);
449449 if (de->proc_iops)
450450 inode->i_op = de->proc_iops;
451451 if (de->proc_fops) {
fs/qnx4/inode.c+1−1
@@ -379,7 +379,7 @@ struct inode *qnx4_iget(struct super_block *sb, unsigned long ino) · 378 unmodified lines
379379 inode->i_mode = le16_to_cpu(raw_inode->di_mode);
380380 inode->i_uid = (uid_t)le16_to_cpu(raw_inode->di_uid);
381381 inode->i_gid = (gid_t)le16_to_cpu(raw_inode->di_gid);
382− inode->i_nlink = le16_to_cpu(raw_inode->di_nlink);
382+ set_nlink(inode, le16_to_cpu(raw_inode->di_nlink));
383383 inode->i_size = le32_to_cpu(raw_inode->di_size);
384384 inode->i_mtime.tv_sec = le32_to_cpu(raw_inode->di_mtime);
385385 inode->i_mtime.tv_nsec = 0;
fs/reiserfs/inode.c+3−3
@@ -1154,7 +1154,7 @@ static void init_inode(struct inode *inode, struct treepath *path) · 1153 unmodified lines
11541154 set_inode_item_key_version(inode, KEY_FORMAT_3_5);
11551155 set_inode_sd_version(inode, STAT_DATA_V1);
11561156 inode->i_mode = sd_v1_mode(sd);
1157− inode->i_nlink = sd_v1_nlink(sd);
1157+ set_nlink(inode, sd_v1_nlink(sd));
11581158 inode->i_uid = sd_v1_uid(sd);
11591159 inode->i_gid = sd_v1_gid(sd);
11601160 inode->i_size = sd_v1_size(sd);
@@ -1199,7 +1199,7 @@ static void init_inode(struct inode *inode, struct treepath *path) · 38 unmodified lines
11991199 struct stat_data *sd = (struct stat_data *)B_I_PITEM(bh, ih);
12001200
12011201 inode->i_mode = sd_v2_mode(sd);
1202− inode->i_nlink = sd_v2_nlink(sd);
1202+ set_nlink(inode, sd_v2_nlink(sd));
12031203 inode->i_uid = sd_v2_uid(sd);
12041204 inode->i_size = sd_v2_size(sd);
12051205 inode->i_gid = sd_v2_gid(sd);
@@ -1832,7 +1832,7 @@ int reiserfs_new_inode(struct reiserfs_transaction_handle *th, · 626 unmodified lines
18321832 #endif
18331833
18341834 /* fill stat data */
1835− inode->i_nlink = (S_ISDIR(mode) ? 2 : 1);
1835+ set_nlink(inode, (S_ISDIR(mode) ? 2 : 1));
18361836
18371837 /* uid and gid must already be set by the caller for quota init */
18381838
fs/reiserfs/namei.c+2−2
@@ -19,7 +19,7 @@ · 18 unmodified lines
1919 #include <linux/reiserfs_xattr.h>
2020 #include <linux/quotaops.h>
2121
22−#define INC_DIR_INODE_NLINK(i) if (i->i_nlink != 1) { inc_nlink(i); if (i->i_nlink >= REISERFS_LINK_MAX) i->i_nlink=1; }
22+#define INC_DIR_INODE_NLINK(i) if (i->i_nlink != 1) { inc_nlink(i); if (i->i_nlink >= REISERFS_LINK_MAX) set_nlink(i, 1); }
2323 #define DEC_DIR_INODE_NLINK(i) if (i->i_nlink != 1) drop_nlink(i);
2424
2525 // directory item contains array of entry headers. This performs
@@ -964,7 +964,7 @@ static int reiserfs_unlink(struct inode *dir, struct dentry *dentry) · 938 unmodified lines
964964 reiserfs_warning(inode->i_sb, "reiserfs-7042",
965965 "deleting nonexistent file (%lu), %d",
966966 inode->i_ino, inode->i_nlink);
967− inode->i_nlink = 1;
967+ set_nlink(inode, 1);
968968 }
969969
970970 drop_nlink(inode);
fs/romfs/super.c+1−1
@@ -337,7 +337,7 @@ static struct inode *romfs_iget(struct super_block *sb, unsigned long pos) · 336 unmodified lines
337337 inode->i_metasize = (ROMFH_SIZE + nlen + 1 + ROMFH_PAD) & ROMFH_MASK;
338338 inode->i_dataoffset = pos + inode->i_metasize;
339339
340− i->i_nlink = 1; /* Hard to decide.. */
340+ set_nlink(i, 1); /* Hard to decide.. */
341341 i->i_size = be32_to_cpu(ri.size);
342342 i->i_mtime.tv_sec = i->i_atime.tv_sec = i->i_ctime.tv_sec = 0;
343343 i->i_mtime.tv_nsec = i->i_atime.tv_nsec = i->i_ctime.tv_nsec = 0;
fs/squashfs/inode.c+9−9
@@ -159,7 +159,7 @@ int squashfs_read_inode(struct inode *inode, long long ino) · 158 unmodified lines
159159 frag_offset = 0;
160160 }
161161
162− inode->i_nlink = 1;
162+ set_nlink(inode, 1);
163163 inode->i_size = le32_to_cpu(sqsh_ino->file_size);
164164 inode->i_fop = &generic_ro_fops;
165165 inode->i_mode |= S_IFREG;
@@ -203,7 +203,7 @@ int squashfs_read_inode(struct inode *inode, long long ino) · 37 unmodified lines
203203 }
204204
205205 xattr_id = le32_to_cpu(sqsh_ino->xattr);
206− inode->i_nlink = le32_to_cpu(sqsh_ino->nlink);
206+ set_nlink(inode, le32_to_cpu(sqsh_ino->nlink));
207207 inode->i_size = le64_to_cpu(sqsh_ino->file_size);
208208 inode->i_op = &squashfs_inode_ops;
209209 inode->i_fop = &generic_ro_fops;
@@ -232,7 +232,7 @@ int squashfs_read_inode(struct inode *inode, long long ino) · 22 unmodified lines
232232 if (err < 0)
233233 goto failed_read;
234234
235− inode->i_nlink = le32_to_cpu(sqsh_ino->nlink);
235+ set_nlink(inode, le32_to_cpu(sqsh_ino->nlink));
236236 inode->i_size = le16_to_cpu(sqsh_ino->file_size);
237237 inode->i_op = &squashfs_dir_inode_ops;
238238 inode->i_fop = &squashfs_dir_ops;
@@ -257,7 +257,7 @@ int squashfs_read_inode(struct inode *inode, long long ino) · 18 unmodified lines
257257 goto failed_read;
258258
259259 xattr_id = le32_to_cpu(sqsh_ino->xattr);
260− inode->i_nlink = le32_to_cpu(sqsh_ino->nlink);
260+ set_nlink(inode, le32_to_cpu(sqsh_ino->nlink));
261261 inode->i_size = le32_to_cpu(sqsh_ino->file_size);
262262 inode->i_op = &squashfs_dir_inode_ops;
263263 inode->i_fop = &squashfs_dir_ops;
@@ -284,7 +284,7 @@ int squashfs_read_inode(struct inode *inode, long long ino) · 20 unmodified lines
284284 if (err < 0)
285285 goto failed_read;
286286
287− inode->i_nlink = le32_to_cpu(sqsh_ino->nlink);
287+ set_nlink(inode, le32_to_cpu(sqsh_ino->nlink));
288288 inode->i_size = le32_to_cpu(sqsh_ino->symlink_size);
289289 inode->i_op = &squashfs_symlink_inode_ops;
290290 inode->i_data.a_ops = &squashfs_symlink_aops;
@@ -325,7 +325,7 @@ int squashfs_read_inode(struct inode *inode, long long ino) · 34 unmodified lines
325325 inode->i_mode |= S_IFCHR;
326326 else
327327 inode->i_mode |= S_IFBLK;
328− inode->i_nlink = le32_to_cpu(sqsh_ino->nlink);
328+ set_nlink(inode, le32_to_cpu(sqsh_ino->nlink));
329329 rdev = le32_to_cpu(sqsh_ino->rdev);
330330 init_special_inode(inode, inode->i_mode, new_decode_dev(rdev));
331331
@@ -349,7 +349,7 @@ int squashfs_read_inode(struct inode *inode, long long ino) · 17 unmodified lines
349349 inode->i_mode |= S_IFBLK;
350350 xattr_id = le32_to_cpu(sqsh_ino->xattr);
351351 inode->i_op = &squashfs_inode_ops;
352− inode->i_nlink = le32_to_cpu(sqsh_ino->nlink);
352+ set_nlink(inode, le32_to_cpu(sqsh_ino->nlink));
353353 rdev = le32_to_cpu(sqsh_ino->rdev);
354354 init_special_inode(inode, inode->i_mode, new_decode_dev(rdev));
355355
@@ -370,7 +370,7 @@ int squashfs_read_inode(struct inode *inode, long long ino) · 14 unmodified lines
370370 inode->i_mode |= S_IFIFO;
371371 else
372372 inode->i_mode |= S_IFSOCK;
373− inode->i_nlink = le32_to_cpu(sqsh_ino->nlink);
373+ set_nlink(inode, le32_to_cpu(sqsh_ino->nlink));
374374 init_special_inode(inode, inode->i_mode, 0);
375375 break;
376376 }
@@ -389,7 +389,7 @@ int squashfs_read_inode(struct inode *inode, long long ino) · 12 unmodified lines
389389 inode->i_mode |= S_IFSOCK;
390390 xattr_id = le32_to_cpu(sqsh_ino->xattr);
391391 inode->i_op = &squashfs_inode_ops;
392− inode->i_nlink = le32_to_cpu(sqsh_ino->nlink);
392+ set_nlink(inode, le32_to_cpu(sqsh_ino->nlink));
393393 init_special_inode(inode, inode->i_mode, 0);
394394 break;
395395 }
fs/stack.c+1−1
@@ -71,6 +71,6 @@ void fsstack_copy_attr_all(struct inode *dest, const struct inode *src) · 70 unmodified lines
7171 dest->i_ctime = src->i_ctime;
7272 dest->i_blkbits = src->i_blkbits;
7373 dest->i_flags = src->i_flags;
74− dest->i_nlink = src->i_nlink;
74+ set_nlink(dest, src->i_nlink);
7575 }
7676 EXPORT_SYMBOL_GPL(fsstack_copy_attr_all);
fs/sysfs/inode.c+1−1
@@ -218,7 +218,7 @@ static void sysfs_refresh_inode(struct sysfs_dirent *sd, struct inode *inode) · 217 unmodified lines
218218 }
219219
220220 if (sysfs_type(sd) == SYSFS_DIR)
221− inode->i_nlink = sd->s_dir.subdirs + 2;
221+ set_nlink(inode, sd->s_dir.subdirs + 2);
222222 }
223223
224224 int sysfs_getattr(struct vfsmount *mnt, struct dentry *dentry, struct kstat *stat)
fs/sysv/inode.c+1−1
@@ -219,7 +219,7 @@ struct inode *sysv_iget(struct super_block *sb, unsigned int ino) · 218 unmodified lines
219219 inode->i_mode = fs16_to_cpu(sbi, raw_inode->i_mode);
220220 inode->i_uid = (uid_t)fs16_to_cpu(sbi, raw_inode->i_uid);
221221 inode->i_gid = (gid_t)fs16_to_cpu(sbi, raw_inode->i_gid);
222− inode->i_nlink = fs16_to_cpu(sbi, raw_inode->i_nlink);
222+ set_nlink(inode, fs16_to_cpu(sbi, raw_inode->i_nlink));
223223 inode->i_size = fs32_to_cpu(sbi, raw_inode->i_size);
224224 inode->i_atime.tv_sec = fs32_to_cpu(sbi, raw_inode->i_atime);
225225 inode->i_mtime.tv_sec = fs32_to_cpu(sbi, raw_inode->i_mtime);
fs/ubifs/super.c+1−1
@@ -129,7 +129,7 @@ struct inode *ubifs_iget(struct super_block *sb, unsigned long inum) · 128 unmodified lines
129129 goto out_ino;
130130
131131 inode->i_flags |= (S_NOCMTIME | S_NOATIME);
132− inode->i_nlink = le32_to_cpu(ino->nlink);
132+ set_nlink(inode, le32_to_cpu(ino->nlink));
133133 inode->i_uid = le32_to_cpu(ino->uid);
134134 inode->i_gid = le32_to_cpu(ino->gid);
135135 inode->i_atime.tv_sec = (int64_t)le64_to_cpu(ino->atime_sec);
fs/ubifs/xattr.c+1−1
@@ -561,7 +561,7 @@ int ubifs_removexattr(struct dentry *dentry, const char *name) · 560 unmodified lines
561561 clear_nlink(inode);
562562 err = remove_xattr(c, host, inode, &nm);
563563 if (err)
564− inode->i_nlink = 1;
564+ set_nlink(inode, 1);
565565
566566 /* If @i_nlink is 0, 'iput()' will delete the inode */
567567 iput(inode);
fs/udf/inode.c+5−3
@@ -1236,6 +1236,7 @@ static void udf_fill_inode(struct inode *inode, struct buffer_head *bh) · 1235 unmodified lines
12361236 int offset;
12371237 struct udf_sb_info *sbi = UDF_SB(inode->i_sb);
12381238 struct udf_inode_info *iinfo = UDF_I(inode);
1239+ unsigned int link_count;
12391240
12401241 fe = (struct fileEntry *)bh->b_data;
12411242 efe = (struct extendedFileEntry *)bh->b_data;
@@ -1318,9 +1319,10 @@ static void udf_fill_inode(struct inode *inode, struct buffer_head *bh) · 76 unmodified lines
13181319 inode->i_mode &= ~sbi->s_umask;
13191320 read_unlock(&sbi->s_cred_lock);
13201321
1321− inode->i_nlink = le16_to_cpu(fe->fileLinkCount);
1322− if (!inode->i_nlink)
1323− inode->i_nlink = 1;
1322+ link_count = le16_to_cpu(fe->fileLinkCount);
1323+ if (!link_count)
1324+ link_count = 1;
1325+ set_nlink(inode, link_count);
13241326
13251327 inode->i_size = le64_to_cpu(fe->informationLength);
13261328 iinfo->i_lenExtents = inode->i_size;
fs/udf/namei.c+2−2
@@ -667,7 +667,7 @@ static int udf_mkdir(struct inode *dir, struct dentry *dentry, int mode) · 666 unmodified lines
667667 iput(inode);
668668 goto out;
669669 }
670− inode->i_nlink = 2;
670+ set_nlink(inode, 2);
671671 cfi.icb.extLength = cpu_to_le32(inode->i_sb->s_blocksize);
672672 cfi.icb.extLocation = cpu_to_lelb(dinfo->i_location);
673673 *(__le32 *)((struct allocDescImpUse *)cfi.icb.impUse)->impUse =
@@ -837,7 +837,7 @@ static int udf_unlink(struct inode *dir, struct dentry *dentry) · 163 unmodified lines
837837 if (!inode->i_nlink) {
838838 udf_debug("Deleting nonexistent file (%lu), %d\n",
839839 inode->i_ino, inode->i_nlink);
840− inode->i_nlink = 1;
840+ set_nlink(inode, 1);
841841 }
842842 retval = udf_delete_entry(dir, fi, &fibh, &cfi);
843843 if (retval)
fs/ufs/inode.c+2−2
@@ -589,7 +589,7 @@ static int ufs1_read_inode(struct inode *inode, struct ufs_inode *ufs_inode) · 588 unmodified lines
589589 * Copy data to the in-core inode.
590590 */
591591 inode->i_mode = mode = fs16_to_cpu(sb, ufs_inode->ui_mode);
592− inode->i_nlink = fs16_to_cpu(sb, ufs_inode->ui_nlink);
592+ set_nlink(inode, fs16_to_cpu(sb, ufs_inode->ui_nlink));
593593 if (inode->i_nlink == 0) {
594594 ufs_error (sb, "ufs_read_inode", "inode %lu has zero nlink\n", inode->i_ino);
595595 return -1;
@@ -637,7 +637,7 @@ static int ufs2_read_inode(struct inode *inode, struct ufs2_inode *ufs2_inode) · 41 unmodified lines
637637 * Copy data to the in-core inode.
638638 */
639639 inode->i_mode = mode = fs16_to_cpu(sb, ufs2_inode->ui_mode);
640− inode->i_nlink = fs16_to_cpu(sb, ufs2_inode->ui_nlink);
640+ set_nlink(inode, fs16_to_cpu(sb, ufs2_inode->ui_nlink));
641641 if (inode->i_nlink == 0) {
642642 ufs_error (sb, "ufs_read_inode", "inode %lu has zero nlink\n", inode->i_ino);
643643 return -1;
fs/xfs/xfs_iops.c+1−1
@@ -1153,7 +1153,7 @@ xfs_setup_inode( · 1152 unmodified lines
11531153 hlist_add_fake(&inode->i_hash);
11541154
11551155 inode->i_mode = ip->i_d.di_mode;
1156− inode->i_nlink = ip->i_d.di_nlink;
1156+ set_nlink(inode, ip->i_d.di_nlink);
11571157 inode->i_uid = ip->i_d.di_uid;
11581158 inode->i_gid = ip->i_d.di_gid;
11591159
include/linux/fs.h+13−0
@@ -1754,6 +1754,19 @@ static inline void mark_inode_dirty_sync(struct inode *inode) · 1753 unmodified lines
17541754 __mark_inode_dirty(inode, I_DIRTY_SYNC);
17551755 }
17561756
1757+/**
1758+ * set_nlink - directly set an inode's link count
1759+ * @inode: inode
1760+ * @nlink: new nlink (should be non-zero)
1761+ *
1762+ * This is a low-level filesystem helper to replace any
1763+ * direct filesystem manipulation of i_nlink.
1764+ */
1765+static inline void set_nlink(struct inode *inode, unsigned int nlink)
1766+{
1767+ inode->i_nlink = nlink;
1768+}
1769+
17571770 /**
17581771 * inc_nlink - directly increment an inode's link count
17591772 * @inode: inode

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t