openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/hch/vfs-queue 

* 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/hch/vfs-queue:
  vfs: add d_prune dentry operation
  vfs: protect i_nlink
  filesystems: add set_nlink()
  filesystems: add missing nlink wrappers
  logfs: remove unnecessary nlink setting
  ocfs2: remove unnecessary nlink setting
  jfs: remove unnecessary nlink setting
  hypfs: remove unnecessary nlink setting
  vfs: ignore error on forced remount
  readlinkat: ensure we return ENOENT for the empty pathname for normal lookups
  vfs: fix dentry leak in simple_fill_super()
This commit is contained in:
Linus Torvalds 2011-11-02 11:41:01 -07:00
parent f1f8935a5c f0023bc617
commit d211858837
108 changed files with 301 additions and 235 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Documentation/filesystems/Locking
View File

@ -29,6 +29,7 @@ d_hash no no no maybe
d_compare: yes no no maybe d_compare: yes no no maybe
d_delete: no yes no no d_delete: no yes no no
d_release: no no yes no d_release: no no yes no
d_prune: no yes no no
d_iput: no no yes no d_iput: no no yes no
d_dname: no no no no d_dname: no no no no
d_automount: no no yes no d_automount: no no yes no

6
arch/s390/hypfs/inode.c
View File

@ -108,9 +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);
else
ret->i_nlink = 1;
} }
return ret; return ret;
} }
@ -361,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;

2
drivers/mtd/mtdchar.c
View File

@ -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);
} }
} }

2
drivers/staging/pohmelfs/inode.c
View File

@ -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;

4
fs/9p/vfs_inode.c
View File

@ -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;

4
fs/9p/vfs_inode_dotl.c
View File

@ -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)) ||

2
fs/adfs/inode.c
View File

@ -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;

4
fs/affs/amigaffs.c
View File

@ -215,7 +215,7 @@ affs_remove_link(struct dentry *dentry)
break; break;
default: default:
if (!AFFS_TAIL(sb, bh)->link_chain) if (!AFFS_TAIL(sb, bh)->link_chain)
inode->i_nlink = 1; set_nlink(inode, 1);
} }
affs_free_block(sb, link_ino); affs_free_block(sb, link_ino);
goto done; goto done;
@ -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);

8
fs/affs/inode.c
View File

@ -54,7 +54,7 @@ struct inode *affs_iget(struct super_block *sb, unsigned long ino)
prot = be32_to_cpu(tail->protect); prot = be32_to_cpu(tail->protect);
inode->i_size = 0; inode->i_size = 0;
inode->i_nlink = 1; set_nlink(inode, 1);
inode->i_mode = 0; inode->i_mode = 0;
AFFS_I(inode)->i_extcnt = 1; AFFS_I(inode)->i_extcnt = 1;
AFFS_I(inode)->i_ext_last = ~1; AFFS_I(inode)->i_ext_last = ~1;
@ -137,7 +137,7 @@ struct inode *affs_iget(struct super_block *sb, unsigned long ino)
sbi->s_hashsize + 1; sbi->s_hashsize + 1;
} }
if (tail->link_chain) if (tail->link_chain)
inode->i_nlink = 2; set_nlink(inode, 2);
inode->i_mapping->a_ops = (sbi->s_flags & SF_OFS) ? &affs_aops_ofs : &affs_aops; inode->i_mapping->a_ops = (sbi->s_flags & SF_OFS) ? &affs_aops_ofs : &affs_aops;
inode->i_op = &affs_file_inode_operations; inode->i_op = &affs_file_inode_operations;
inode->i_fop = &affs_file_operations; inode->i_fop = &affs_file_operations;
@ -304,7 +304,7 @@ affs_new_inode(struct inode *dir)
inode->i_uid = current_fsuid(); inode->i_uid = current_fsuid();
inode->i_gid = current_fsgid(); inode->i_gid = current_fsgid();
inode->i_ino = block; inode->i_ino = block;
inode->i_nlink = 1; set_nlink(inode, 1);
inode->i_mtime = inode->i_atime = inode->i_ctime = CURRENT_TIME_SEC; inode->i_mtime = inode->i_atime = inode->i_ctime = CURRENT_TIME_SEC;
atomic_set(&AFFS_I(inode)->i_opencnt, 0); atomic_set(&AFFS_I(inode)->i_opencnt, 0);
AFFS_I(inode)->i_blkcnt = 0; AFFS_I(inode)->i_blkcnt = 0;
@ -387,7 +387,7 @@ affs_add_entry(struct inode *dir, struct inode *inode, struct dentry *dentry, s3
AFFS_TAIL(sb, inode_bh)->link_chain = cpu_to_be32(block); AFFS_TAIL(sb, inode_bh)->link_chain = cpu_to_be32(block);
affs_adjust_checksum(inode_bh, block - be32_to_cpu(chain)); affs_adjust_checksum(inode_bh, block - be32_to_cpu(chain));
mark_buffer_dirty_inode(inode_bh, inode); mark_buffer_dirty_inode(inode_bh, inode);
inode->i_nlink = 2; set_nlink(inode, 2);
ihold(inode); ihold(inode);
} }
affs_fix_checksum(sb, bh); affs_fix_checksum(sb, bh);

6
fs/affs/namei.c
View File

@ -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;

2
fs/afs/fsclient.c
View File

@ -90,7 +90,7 @@ static void xdr_decode_AFSFetchStatus(const __be32 **_bp,
vnode->vfs_inode.i_uid = status->owner; vnode->vfs_inode.i_uid = status->owner;
vnode->vfs_inode.i_gid = status->group; vnode->vfs_inode.i_gid = status->group;
vnode->vfs_inode.i_generation = vnode->fid.unique; vnode->vfs_inode.i_generation = vnode->fid.unique;
vnode->vfs_inode.i_nlink = status->nlink; set_nlink(&vnode->vfs_inode, status->nlink);
mode = vnode->vfs_inode.i_mode; mode = vnode->vfs_inode.i_mode;
mode &= ~S_IALLUGO; mode &= ~S_IALLUGO;

4
fs/afs/inode.c
View File

@ -67,7 +67,7 @@ static int afs_inode_map_status(struct afs_vnode *vnode, struct key *key)
fscache_attr_changed(vnode->cache); fscache_attr_changed(vnode->cache);
#endif #endif
inode->i_nlink = vnode->status.nlink; set_nlink(inode, vnode->status.nlink);
inode->i_uid = vnode->status.owner; inode->i_uid = vnode->status.owner;
inode->i_gid = 0; inode->i_gid = 0;
inode->i_size = vnode->status.size; inode->i_size = vnode->status.size;
@ -174,7 +174,7 @@ struct inode *afs_iget_autocell(struct inode *dir, const char *dev_name,
inode->i_size = 0; inode->i_size = 0;
inode->i_mode = S_IFDIR | S_IRUGO | S_IXUGO; inode->i_mode = S_IFDIR | S_IRUGO | S_IXUGO;
inode->i_op = &afs_autocell_inode_operations; inode->i_op = &afs_autocell_inode_operations;
inode->i_nlink = 2; set_nlink(inode, 2);
inode->i_uid = 0; inode->i_uid = 0;
inode->i_gid = 0; inode->i_gid = 0;
inode->i_ctime.tv_sec = get_seconds(); inode->i_ctime.tv_sec = get_seconds();

2
fs/autofs4/inode.c
View File

@ -342,7 +342,7 @@ struct inode *autofs4_get_inode(struct super_block *sb, mode_t mode)
inode->i_ino = get_next_ino(); inode->i_ino = get_next_ino();
if (S_ISDIR(mode)) { if (S_ISDIR(mode)) {
inode->i_nlink = 2; set_nlink(inode, 2);
inode->i_op = &autofs4_dir_inode_operations; inode->i_op = &autofs4_dir_inode_operations;
inode->i_fop = &autofs4_dir_operations; inode->i_fop = &autofs4_dir_operations;
} else if (S_ISLNK(mode)) { } else if (S_ISLNK(mode)) {

2
fs/befs/linuxvfs.c
View File

@ -357,7 +357,7 @@ static struct inode *befs_iget(struct super_block *sb, unsigned long ino)
inode->i_gid = befs_sb->mount_opts.use_gid ? inode->i_gid = befs_sb->mount_opts.use_gid ?
befs_sb->mount_opts.gid : (gid_t) fs32_to_cpu(sb, raw_inode->gid); befs_sb->mount_opts.gid : (gid_t) fs32_to_cpu(sb, raw_inode->gid);
inode->i_nlink = 1; set_nlink(inode, 1);
/* /*
* BEFS's time is 64 bits, but current VFS is 32 bits... * BEFS's time is 64 bits, but current VFS is 32 bits...

2
fs/bfs/dir.c
View File

@ -199,7 +199,7 @@ static int bfs_unlink(struct inode *dir, struct dentry *dentry)
printf("unlinking non-existent file %s:%lu (nlink=%d)\n", printf("unlinking non-existent file %s:%lu (nlink=%d)\n",
inode->i_sb->s_id, inode->i_ino, inode->i_sb->s_id, inode->i_ino,
inode->i_nlink); inode->i_nlink);
inode->i_nlink = 1; set_nlink(inode, 1);
} }
de->ino = 0; de->ino = 0;
mark_buffer_dirty_inode(bh, dir); mark_buffer_dirty_inode(bh, dir);

2
fs/bfs/inode.c
View File

@ -78,7 +78,7 @@ struct inode *bfs_iget(struct super_block *sb, unsigned long ino)
BFS_I(inode)->i_dsk_ino = le16_to_cpu(di->i_ino); BFS_I(inode)->i_dsk_ino = le16_to_cpu(di->i_ino);
inode->i_uid = le32_to_cpu(di->i_uid); inode->i_uid = le32_to_cpu(di->i_uid);
inode->i_gid = le32_to_cpu(di->i_gid); inode->i_gid = le32_to_cpu(di->i_gid);
inode->i_nlink = le32_to_cpu(di->i_nlink); set_nlink(inode, le32_to_cpu(di->i_nlink));
inode->i_size = BFS_FILESIZE(di); inode->i_size = BFS_FILESIZE(di);
inode->i_blocks = BFS_FILEBLOCKS(di); inode->i_blocks = BFS_FILEBLOCKS(di);
inode->i_atime.tv_sec = le32_to_cpu(di->i_atime); inode->i_atime.tv_sec = le32_to_cpu(di->i_atime);

2
fs/binfmt_misc.c
View File

@ -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);

2
fs/btrfs/delayed-inode.c
View File

@ -1641,7 +1641,7 @@ int btrfs_fill_inode(struct inode *inode, u32 *rdev)
inode->i_gid = btrfs_stack_inode_gid(inode_item); inode->i_gid = btrfs_stack_inode_gid(inode_item);
btrfs_i_size_write(inode, btrfs_stack_inode_size(inode_item)); btrfs_i_size_write(inode, btrfs_stack_inode_size(inode_item));
inode->i_mode = btrfs_stack_inode_mode(inode_item); inode->i_mode = btrfs_stack_inode_mode(inode_item);
inode->i_nlink = btrfs_stack_inode_nlink(inode_item); set_nlink(inode, btrfs_stack_inode_nlink(inode_item));
inode_set_bytes(inode, btrfs_stack_inode_nbytes(inode_item)); inode_set_bytes(inode, btrfs_stack_inode_nbytes(inode_item));
BTRFS_I(inode)->generation = btrfs_stack_inode_generation(inode_item); BTRFS_I(inode)->generation = btrfs_stack_inode_generation(inode_item);
BTRFS_I(inode)->sequence = btrfs_stack_inode_sequence(inode_item); BTRFS_I(inode)->sequence = btrfs_stack_inode_sequence(inode_item);

2
fs/btrfs/disk-io.c
View File

@ -1705,7 +1705,7 @@ struct btrfs_root *open_ctree(struct super_block *sb,
sb->s_bdi = &fs_info->bdi; sb->s_bdi = &fs_info->bdi;
fs_info->btree_inode->i_ino = BTRFS_BTREE_INODE_OBJECTID; fs_info->btree_inode->i_ino = BTRFS_BTREE_INODE_OBJECTID;
fs_info->btree_inode->i_nlink = 1; set_nlink(fs_info->btree_inode, 1);
/* /*
* we set the i_size on the btree inode to the max possible int. * we set the i_size on the btree inode to the max possible int.
* the real end of the address space is determined by all of * the real end of the address space is determined by all of

4
fs/btrfs/inode.c
View File

@ -2534,7 +2534,7 @@ static void btrfs_read_locked_inode(struct inode *inode)
inode_item = btrfs_item_ptr(leaf, path->slots[0], inode_item = btrfs_item_ptr(leaf, path->slots[0],
struct btrfs_inode_item); struct btrfs_inode_item);
inode->i_mode = btrfs_inode_mode(leaf, inode_item); inode->i_mode = btrfs_inode_mode(leaf, inode_item);
inode->i_nlink = btrfs_inode_nlink(leaf, inode_item); set_nlink(inode, btrfs_inode_nlink(leaf, inode_item));
inode->i_uid = btrfs_inode_uid(leaf, inode_item); inode->i_uid = btrfs_inode_uid(leaf, inode_item);
inode->i_gid = btrfs_inode_gid(leaf, inode_item); inode->i_gid = btrfs_inode_gid(leaf, inode_item);
btrfs_i_size_write(inode, btrfs_inode_size(leaf, inode_item)); 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,
inode->i_op = &btrfs_dir_inode_operations; inode->i_op = &btrfs_dir_inode_operations;
inode->i_fop = &btrfs_dir_file_operations; inode->i_fop = &btrfs_dir_file_operations;
inode->i_nlink = 1; set_nlink(inode, 1);
btrfs_i_size_write(inode, 0); btrfs_i_size_write(inode, 0);
err = btrfs_update_inode(trans, new_root, inode); err = btrfs_update_inode(trans, new_root, inode);

2
fs/btrfs/tree-log.c
View File

@ -1030,7 +1030,7 @@ static noinline int fixup_inode_link_count(struct btrfs_trans_handle *trans,
} }
btrfs_release_path(path); btrfs_release_path(path);
if (nlink != inode->i_nlink) { if (nlink != inode->i_nlink) {
inode->i_nlink = nlink; set_nlink(inode, nlink);
btrfs_update_inode(trans, root, inode); btrfs_update_inode(trans, root, inode);
} }
BTRFS_I(inode)->index_cnt = (u64)-1; BTRFS_I(inode)->index_cnt = (u64)-1;

2
fs/ceph/caps.c
View File

@ -2363,7 +2363,7 @@ static void handle_cap_grant(struct inode *inode, struct ceph_mds_caps *grant,
} }
if ((issued & CEPH_CAP_LINK_EXCL) == 0) if ((issued & CEPH_CAP_LINK_EXCL) == 0)
inode->i_nlink = le32_to_cpu(grant->nlink); set_nlink(inode, le32_to_cpu(grant->nlink));
if ((issued & CEPH_CAP_XATTR_EXCL) == 0 && grant->xattr_len) { if ((issued & CEPH_CAP_XATTR_EXCL) == 0 && grant->xattr_len) {
int len = le32_to_cpu(grant->xattr_len); int len = le32_to_cpu(grant->xattr_len);

2
fs/ceph/inode.c
View File

@ -618,7 +618,7 @@ static int fill_inode(struct inode *inode,
} }
if ((issued & CEPH_CAP_LINK_EXCL) == 0) if ((issued & CEPH_CAP_LINK_EXCL) == 0)
inode->i_nlink = le32_to_cpu(info->nlink); set_nlink(inode, le32_to_cpu(info->nlink));
/* be careful with mtime, atime, size */ /* be careful with mtime, atime, size */
ceph_decode_timespec(&atime, &info->atime); ceph_decode_timespec(&atime, &info->atime);

6
fs/cifs/inode.c
View File

@ -132,7 +132,7 @@ cifs_fattr_to_inode(struct inode *inode, struct cifs_fattr *fattr)
inode->i_mtime = fattr->cf_mtime; inode->i_mtime = fattr->cf_mtime;
inode->i_ctime = fattr->cf_ctime; inode->i_ctime = fattr->cf_ctime;
inode->i_rdev = fattr->cf_rdev; inode->i_rdev = fattr->cf_rdev;
inode->i_nlink = fattr->cf_nlink; set_nlink(inode, fattr->cf_nlink);
inode->i_uid = fattr->cf_uid; inode->i_uid = fattr->cf_uid;
inode->i_gid = fattr->cf_gid; inode->i_gid = fattr->cf_gid;
@ -905,7 +905,7 @@ struct inode *cifs_root_iget(struct super_block *sb)
if (rc && tcon->ipc) { if (rc && tcon->ipc) {
cFYI(1, "ipc connection - fake read inode"); cFYI(1, "ipc connection - fake read inode");
inode->i_mode |= S_IFDIR; inode->i_mode |= S_IFDIR;
inode->i_nlink = 2; set_nlink(inode, 2);
inode->i_op = &cifs_ipc_inode_ops; inode->i_op = &cifs_ipc_inode_ops;
inode->i_fop = &simple_dir_operations; inode->i_fop = &simple_dir_operations;
inode->i_uid = cifs_sb->mnt_uid; inode->i_uid = cifs_sb->mnt_uid;
@ -1367,7 +1367,7 @@ int cifs_mkdir(struct inode *inode, struct dentry *direntry, int mode)
/* setting nlink not necessary except in cases where we /* setting nlink not necessary except in cases where we
* failed to get it from the server or was set bogus */ * failed to get it from the server or was set bogus */
if ((direntry->d_inode) && (direntry->d_inode->i_nlink < 2)) if ((direntry->d_inode) && (direntry->d_inode->i_nlink < 2))
direntry->d_inode->i_nlink = 2; set_nlink(direntry->d_inode, 2);
mode &= ~current_umask(); mode &= ~current_umask();
/* must turn on setgid bit if parent dir has it */ /* must turn on setgid bit if parent dir has it */

2
fs/cifs/link.c
View File

@ -433,7 +433,7 @@ cifs_hardlink(struct dentry *old_file, struct inode *inode,
if (old_file->d_inode) { if (old_file->d_inode) {
cifsInode = CIFS_I(old_file->d_inode); cifsInode = CIFS_I(old_file->d_inode);
if (rc == 0) { if (rc == 0) {
old_file->d_inode->i_nlink++; inc_nlink(old_file->d_inode);
/* BB should we make this contingent on superblock flag NOATIME? */ /* BB should we make this contingent on superblock flag NOATIME? */
/* old_file->d_inode->i_ctime = CURRENT_TIME;*/ /* old_file->d_inode->i_ctime = CURRENT_TIME;*/
/* parent dir timestamps will update from srv /* parent dir timestamps will update from srv

2
fs/coda/coda_linux.c
View File

@ -104,7 +104,7 @@ void coda_vattr_to_iattr(struct inode *inode, struct coda_vattr *attr)
if (attr->va_gid != -1) if (attr->va_gid != -1)
inode->i_gid = (gid_t) attr->va_gid; inode->i_gid = (gid_t) attr->va_gid;
if (attr->va_nlink != -1) if (attr->va_nlink != -1)
inode->i_nlink = attr->va_nlink; set_nlink(inode, attr->va_nlink);
if (attr->va_size != -1) if (attr->va_size != -1)
inode->i_size = attr->va_size; inode->i_size = attr->va_size;
if (attr->va_size != -1) if (attr->va_size != -1)

2
fs/coda/dir.c
View File

@ -340,7 +340,7 @@ static int coda_rmdir(struct inode *dir, struct dentry *de)
if (!error) { if (!error) {
/* VFS may delete the child */ /* VFS may delete the child */
if (de->d_inode) if (de->d_inode)
de->d_inode->i_nlink = 0; clear_nlink(de->d_inode);
/* fix the link count of the parent */ /* fix the link count of the parent */
coda_dir_drop_nlink(dir); coda_dir_drop_nlink(dir);

40
fs/dcache.c
View File

@ -225,7 +225,7 @@ static void dentry_unlink_inode(struct dentry * dentry)
} }
/* /*
* dentry_lru_(add|del|move_tail) must be called with d_lock held. * dentry_lru_(add|del|prune|move_tail) must be called with d_lock held.
*/ */
static void dentry_lru_add(struct dentry *dentry) static void dentry_lru_add(struct dentry *dentry)
{ {
@ -245,6 +245,9 @@ static void __dentry_lru_del(struct dentry *dentry)
dentry_stat.nr_unused--; dentry_stat.nr_unused--;
} }
/*
* Remove a dentry with references from the LRU.
*/
static void dentry_lru_del(struct dentry *dentry) static void dentry_lru_del(struct dentry *dentry)
{ {
if (!list_empty(&dentry->d_lru)) { if (!list_empty(&dentry->d_lru)) {
@ -254,6 +257,23 @@ static void dentry_lru_del(struct dentry *dentry)
} }
} }
/*
* Remove a dentry that is unreferenced and about to be pruned
* (unhashed and destroyed) from the LRU, and inform the file system.
* This wrapper should be called _prior_ to unhashing a victim dentry.
*/
static void dentry_lru_prune(struct dentry *dentry)
{
if (!list_empty(&dentry->d_lru)) {
if (dentry->d_flags & DCACHE_OP_PRUNE)
dentry->d_op->d_prune(dentry);
spin_lock(&dcache_lru_lock);
__dentry_lru_del(dentry);
spin_unlock(&dcache_lru_lock);
}
}
static void dentry_lru_move_tail(struct dentry *dentry) static void dentry_lru_move_tail(struct dentry *dentry)
{ {
spin_lock(&dcache_lru_lock); spin_lock(&dcache_lru_lock);
@ -403,8 +423,12 @@ static inline struct dentry *dentry_kill(struct dentry *dentry, int ref)
if (ref) if (ref)
dentry->d_count--; dentry->d_count--;
/* if dentry was on the d_lru list delete it from there */ /*
dentry_lru_del(dentry); * if dentry was on the d_lru list delete it from there.
* inform the fs via d_prune that this dentry is about to be
* unhashed and destroyed.
*/
dentry_lru_prune(dentry);
/* if it was on the hash then remove it */ /* if it was on the hash then remove it */
__d_drop(dentry); __d_drop(dentry);
return d_kill(dentry, parent); return d_kill(dentry, parent);
@ -854,8 +878,12 @@ static void shrink_dcache_for_umount_subtree(struct dentry *dentry)
do { do {
struct inode *inode; struct inode *inode;
/* detach from the system */ /*
dentry_lru_del(dentry); * remove the dentry from the lru, and inform
* the fs that this dentry is about to be
* unhashed and destroyed.
*/
dentry_lru_prune(dentry);
__d_shrink(dentry); __d_shrink(dentry);
if (dentry->d_count != 0) { if (dentry->d_count != 0) {
@ -1283,6 +1311,8 @@ void d_set_d_op(struct dentry *dentry, const struct dentry_operations *op)
dentry->d_flags |= DCACHE_OP_REVALIDATE; dentry->d_flags |= DCACHE_OP_REVALIDATE;
if (op->d_delete) if (op->d_delete)
dentry->d_flags |= DCACHE_OP_DELETE; dentry->d_flags |= DCACHE_OP_DELETE;
if (op->d_prune)
dentry->d_flags |= DCACHE_OP_PRUNE;
} }
EXPORT_SYMBOL(d_set_d_op); EXPORT_SYMBOL(d_set_d_op);

4
fs/devpts/inode.c
View File

@ -307,7 +307,7 @@ devpts_fill_super(struct super_block *s, void *data, int silent)
inode->i_mode = S_IFDIR | S_IRUGO | S_IXUGO | S_IWUSR; inode->i_mode = S_IFDIR | S_IRUGO | S_IXUGO | S_IWUSR;
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;
inode->i_nlink = 2; set_nlink(inode, 2);
s->s_root = d_alloc_root(inode); s->s_root = d_alloc_root(inode);
if (s->s_root) if (s->s_root)
@ -549,7 +549,7 @@ void devpts_pty_kill(struct tty_struct *tty)
dentry = d_find_alias(inode); dentry = d_find_alias(inode);
inode->i_nlink--; drop_nlink(inode);
d_delete(dentry); d_delete(dentry);
dput(dentry); /* d_alloc_name() in devpts_pty_new() */ dput(dentry); /* d_alloc_name() in devpts_pty_new() */
dput(dentry); /* d_find_alias above */ dput(dentry); /* d_find_alias above */

12
fs/ecryptfs/inode.c
View File

@ -474,8 +474,8 @@ static int ecryptfs_link(struct dentry *old_dentry, struct inode *dir,
goto out_lock; goto out_lock;
fsstack_copy_attr_times(dir, lower_dir_dentry->d_inode); fsstack_copy_attr_times(dir, lower_dir_dentry->d_inode);
fsstack_copy_inode_size(dir, lower_dir_dentry->d_inode); fsstack_copy_inode_size(dir, lower_dir_dentry->d_inode);
old_dentry->d_inode->i_nlink = set_nlink(old_dentry->d_inode,
ecryptfs_inode_to_lower(old_dentry->d_inode)->i_nlink; ecryptfs_inode_to_lower(old_dentry->d_inode)->i_nlink);
i_size_write(new_dentry->d_inode, file_size_save); i_size_write(new_dentry->d_inode, file_size_save);
out_lock: out_lock:
unlock_dir(lower_dir_dentry); unlock_dir(lower_dir_dentry);
@ -499,8 +499,8 @@ static int ecryptfs_unlink(struct inode *dir, struct dentry *dentry)
goto out_unlock; goto out_unlock;
} }
fsstack_copy_attr_times(dir, lower_dir_inode); fsstack_copy_attr_times(dir, lower_dir_inode);
dentry->d_inode->i_nlink = set_nlink(dentry->d_inode,
ecryptfs_inode_to_lower(dentry->d_inode)->i_nlink; ecryptfs_inode_to_lower(dentry->d_inode)->i_nlink);
dentry->d_inode->i_ctime = dir->i_ctime; dentry->d_inode->i_ctime = dir->i_ctime;
d_drop(dentry); d_drop(dentry);
out_unlock: out_unlock:
@ -565,7 +565,7 @@ static int ecryptfs_mkdir(struct inode *dir, struct dentry *dentry, int mode)
goto out; goto out;
fsstack_copy_attr_times(dir, lower_dir_dentry->d_inode); fsstack_copy_attr_times(dir, lower_dir_dentry->d_inode);
fsstack_copy_inode_size(dir, lower_dir_dentry->d_inode); fsstack_copy_inode_size(dir, lower_dir_dentry->d_inode);
dir->i_nlink = lower_dir_dentry->d_inode->i_nlink; set_nlink(dir, lower_dir_dentry->d_inode->i_nlink);
out: out:
unlock_dir(lower_dir_dentry); unlock_dir(lower_dir_dentry);
if (!dentry->d_inode) if (!dentry->d_inode)
@ -588,7 +588,7 @@ static int ecryptfs_rmdir(struct inode *dir, struct dentry *dentry)
if (!rc && dentry->d_inode) if (!rc && dentry->d_inode)
clear_nlink(dentry->d_inode); clear_nlink(dentry->d_inode);
fsstack_copy_attr_times(dir, lower_dir_dentry->d_inode); fsstack_copy_attr_times(dir, lower_dir_dentry->d_inode);
dir->i_nlink = lower_dir_dentry->d_inode->i_nlink; set_nlink(dir, lower_dir_dentry->d_inode->i_nlink);
unlock_dir(lower_dir_dentry); unlock_dir(lower_dir_dentry);
if (!rc) if (!rc)
d_drop(dentry); d_drop(dentry);

2
fs/efs/inode.c
View File

@ -96,7 +96,7 @@ struct inode *efs_iget(struct super_block *super, unsigned long ino)
efs_inode = (struct efs_dinode *) (bh->b_data + offset); efs_inode = (struct efs_dinode *) (bh->b_data + offset);
inode->i_mode = be16_to_cpu(efs_inode->di_mode); inode->i_mode = be16_to_cpu(efs_inode->di_mode);
inode->i_nlink = be16_to_cpu(efs_inode->di_nlink); set_nlink(inode, be16_to_cpu(efs_inode->di_nlink));
inode->i_uid = (uid_t)be16_to_cpu(efs_inode->di_uid); inode->i_uid = (uid_t)be16_to_cpu(efs_inode->di_uid);
inode->i_gid = (gid_t)be16_to_cpu(efs_inode->di_gid); inode->i_gid = (gid_t)be16_to_cpu(efs_inode->di_gid);
inode->i_size = be32_to_cpu(efs_inode->di_size); inode->i_size = be32_to_cpu(efs_inode->di_size);

2
fs/exofs/inode.c
View File

@ -1165,7 +1165,7 @@ struct inode *exofs_iget(struct super_block *sb, unsigned long ino)
inode->i_mode = le16_to_cpu(fcb.i_mode); inode->i_mode = le16_to_cpu(fcb.i_mode);
inode->i_uid = le32_to_cpu(fcb.i_uid); inode->i_uid = le32_to_cpu(fcb.i_uid);
inode->i_gid = le32_to_cpu(fcb.i_gid); inode->i_gid = le32_to_cpu(fcb.i_gid);
inode->i_nlink = le16_to_cpu(fcb.i_links_count); set_nlink(inode, le16_to_cpu(fcb.i_links_count));
inode->i_ctime.tv_sec = (signed)le32_to_cpu(fcb.i_ctime); inode->i_ctime.tv_sec = (signed)le32_to_cpu(fcb.i_ctime);
inode->i_atime.tv_sec = (signed)le32_to_cpu(fcb.i_atime); inode->i_atime.tv_sec = (signed)le32_to_cpu(fcb.i_atime);
inode->i_mtime.tv_sec = (signed)le32_to_cpu(fcb.i_mtime); inode->i_mtime.tv_sec = (signed)le32_to_cpu(fcb.i_mtime);

2
fs/ext2/ialloc.c
View File

@ -601,7 +601,7 @@ struct inode *ext2_new_inode(struct inode *dir, int mode,
fail_drop: fail_drop:
dquot_drop(inode); dquot_drop(inode);
inode->i_flags |= S_NOQUOTA; inode->i_flags |= S_NOQUOTA;
inode->i_nlink = 0; clear_nlink(inode);
unlock_new_inode(inode); unlock_new_inode(inode);
iput(inode); iput(inode);
return ERR_PTR(err); return ERR_PTR(err);

2
fs/ext2/inode.c
View File

@ -1321,7 +1321,7 @@ struct inode *ext2_iget (struct super_block *sb, unsigned long ino)
inode->i_uid |= le16_to_cpu(raw_inode->i_uid_high) << 16; inode->i_uid |= le16_to_cpu(raw_inode->i_uid_high) << 16;
inode->i_gid |= le16_to_cpu(raw_inode->i_gid_high) << 16; inode->i_gid |= le16_to_cpu(raw_inode->i_gid_high) << 16;
} }
inode->i_nlink = le16_to_cpu(raw_inode->i_links_count); set_nlink(inode, le16_to_cpu(raw_inode->i_links_count));
inode->i_size = le32_to_cpu(raw_inode->i_size); inode->i_size = le32_to_cpu(raw_inode->i_size);
inode->i_atime.tv_sec = (signed)le32_to_cpu(raw_inode->i_atime); inode->i_atime.tv_sec = (signed)le32_to_cpu(raw_inode->i_atime);
inode->i_ctime.tv_sec = (signed)le32_to_cpu(raw_inode->i_ctime); inode->i_ctime.tv_sec = (signed)le32_to_cpu(raw_inode->i_ctime);

2
fs/ext3/ialloc.c
View File

@ -582,7 +582,7 @@ struct inode *ext3_new_inode(handle_t *handle, struct inode * dir,
fail_drop: fail_drop:
dquot_drop(inode); dquot_drop(inode);
inode->i_flags |= S_NOQUOTA; inode->i_flags |= S_NOQUOTA;
inode->i_nlink = 0; clear_nlink(inode);
unlock_new_inode(inode); unlock_new_inode(inode);
iput(inode); iput(inode);
brelse(bitmap_bh); brelse(bitmap_bh);

2
fs/ext3/inode.c
View File

@ -2899,7 +2899,7 @@ struct inode *ext3_iget(struct super_block *sb, unsigned long ino)
inode->i_uid |= le16_to_cpu(raw_inode->i_uid_high) << 16; inode->i_uid |= le16_to_cpu(raw_inode->i_uid_high) << 16;
inode->i_gid |= le16_to_cpu(raw_inode->i_gid_high) << 16; inode->i_gid |= le16_to_cpu(raw_inode->i_gid_high) << 16;
} }
inode->i_nlink = le16_to_cpu(raw_inode->i_links_count); set_nlink(inode, le16_to_cpu(raw_inode->i_links_count));
inode->i_size = le32_to_cpu(raw_inode->i_size); inode->i_size = le32_to_cpu(raw_inode->i_size);
inode->i_atime.tv_sec = (signed)le32_to_cpu(raw_inode->i_atime); inode->i_atime.tv_sec = (signed)le32_to_cpu(raw_inode->i_atime);
inode->i_ctime.tv_sec = (signed)le32_to_cpu(raw_inode->i_ctime); inode->i_ctime.tv_sec = (signed)le32_to_cpu(raw_inode->i_ctime);

6
fs/ext3/namei.c
View File

@ -1821,7 +1821,7 @@ static int ext3_mkdir(struct inode * dir, struct dentry * dentry, int mode)
de->name_len = 2; de->name_len = 2;
strcpy (de->name, ".."); strcpy (de->name, "..");
ext3_set_de_type(dir->i_sb, de, S_IFDIR); ext3_set_de_type(dir->i_sb, de, S_IFDIR);
inode->i_nlink = 2; set_nlink(inode, 2);
BUFFER_TRACE(dir_block, "call ext3_journal_dirty_metadata"); BUFFER_TRACE(dir_block, "call ext3_journal_dirty_metadata");
err = ext3_journal_dirty_metadata(handle, dir_block); err = ext3_journal_dirty_metadata(handle, dir_block);
if (err) if (err)
@ -1833,7 +1833,7 @@ static int ext3_mkdir(struct inode * dir, struct dentry * dentry, int mode)
if (err) { if (err) {
out_clear_inode: out_clear_inode:
inode->i_nlink = 0; clear_nlink(inode);
unlock_new_inode(inode); unlock_new_inode(inode);
ext3_mark_inode_dirty(handle, inode); ext3_mark_inode_dirty(handle, inode);
iput (inode); iput (inode);
@ -2170,7 +2170,7 @@ static int ext3_unlink(struct inode * dir, struct dentry *dentry)
ext3_warning (inode->i_sb, "ext3_unlink", ext3_warning (inode->i_sb, "ext3_unlink",
"Deleting nonexistent file (%lu), %d", "Deleting nonexistent file (%lu), %d",
inode->i_ino, inode->i_nlink); inode->i_ino, inode->i_nlink);
inode->i_nlink = 1; set_nlink(inode, 1);
} }
retval = ext3_delete_entry(handle, dir, de, bh); retval = ext3_delete_entry(handle, dir, de, bh);
if (retval) if (retval)

2
fs/ext4/ialloc.c
View File

@ -948,7 +948,7 @@ struct inode *ext4_new_inode(handle_t *handle, struct inode *dir, int mode,
fail_drop: fail_drop:
dquot_drop(inode); dquot_drop(inode);
inode->i_flags |= S_NOQUOTA; inode->i_flags |= S_NOQUOTA;
inode->i_nlink = 0; clear_nlink(inode);
unlock_new_inode(inode); unlock_new_inode(inode);
iput(inode); iput(inode);
brelse(inode_bitmap_bh); brelse(inode_bitmap_bh);

2
fs/ext4/inode.c
View File

@ -3791,7 +3791,7 @@ struct inode *ext4_iget(struct super_block *sb, unsigned long ino)
inode->i_uid |= le16_to_cpu(raw_inode->i_uid_high) << 16; inode->i_uid |= le16_to_cpu(raw_inode->i_uid_high) << 16;
inode->i_gid |= le16_to_cpu(raw_inode->i_gid_high) << 16; inode->i_gid |= le16_to_cpu(raw_inode->i_gid_high) << 16;
} }
inode->i_nlink = le16_to_cpu(raw_inode->i_links_count); set_nlink(inode, le16_to_cpu(raw_inode->i_links_count));
ext4_clear_state_flags(ei); /* Only relevant on 32-bit archs */ ext4_clear_state_flags(ei); /* Only relevant on 32-bit archs */
ei->i_dir_start_lookup = 0; ei->i_dir_start_lookup = 0;

2
fs/ext4/migrate.c
View File

@ -481,7 +481,7 @@ int ext4_ext_migrate(struct inode *inode)
* Set the i_nlink to zero so it will be deleted later * Set the i_nlink to zero so it will be deleted later
* when we drop inode reference. * when we drop inode reference.
*/ */
tmp_inode->i_nlink = 0; clear_nlink(tmp_inode);
ext4_ext_tree_init(handle, tmp_inode); ext4_ext_tree_init(handle, tmp_inode);
ext4_orphan_add(handle, tmp_inode); ext4_orphan_add(handle, tmp_inode);

8
fs/ext4/namei.c
View File

@ -1694,7 +1694,7 @@ static void ext4_inc_count(handle_t *handle, struct inode *inode)
if (is_dx(inode) && inode->i_nlink > 1) { if (is_dx(inode) && inode->i_nlink > 1) {
/* limit is 16-bit i_links_count */ /* limit is 16-bit i_links_count */
if (inode->i_nlink >= EXT4_LINK_MAX || inode->i_nlink == 2) { if (inode->i_nlink >= EXT4_LINK_MAX || inode->i_nlink == 2) {
inode->i_nlink = 1; set_nlink(inode, 1);
EXT4_SET_RO_COMPAT_FEATURE(inode->i_sb, EXT4_SET_RO_COMPAT_FEATURE(inode->i_sb,
EXT4_FEATURE_RO_COMPAT_DIR_NLINK); EXT4_FEATURE_RO_COMPAT_DIR_NLINK);
} }
@ -1860,7 +1860,7 @@ static int ext4_mkdir(struct inode *dir, struct dentry *dentry, int mode)
de->name_len = 2; de->name_len = 2;
strcpy(de->name, ".."); strcpy(de->name, "..");
ext4_set_de_type(dir->i_sb, de, S_IFDIR); ext4_set_de_type(dir->i_sb, de, S_IFDIR);
inode->i_nlink = 2; set_nlink(inode, 2);
BUFFER_TRACE(dir_block, "call ext4_handle_dirty_metadata"); BUFFER_TRACE(dir_block, "call ext4_handle_dirty_metadata");
err = ext4_handle_dirty_metadata(handle, inode, dir_block); err = ext4_handle_dirty_metadata(handle, inode, dir_block);
if (err) if (err)
@ -2213,7 +2213,7 @@ static int ext4_unlink(struct inode *dir, struct dentry *dentry)
ext4_warning(inode->i_sb, ext4_warning(inode->i_sb,
"Deleting nonexistent file (%lu), %d", "Deleting nonexistent file (%lu), %d",
inode->i_ino, inode->i_nlink); inode->i_ino, inode->i_nlink);
inode->i_nlink = 1; set_nlink(inode, 1);
} }
retval = ext4_delete_entry(handle, dir, de, bh); retval = ext4_delete_entry(handle, dir, de, bh);
if (retval) if (retval)
@ -2538,7 +2538,7 @@ static int ext4_rename(struct inode *old_dir, struct dentry *old_dentry,
if (new_inode) { if (new_inode) {
/* checked empty_dir above, can't have another parent, /* checked empty_dir above, can't have another parent,
* ext4_dec_count() won't work for many-linked dirs */ * ext4_dec_count() won't work for many-linked dirs */
new_inode->i_nlink = 0; clear_nlink(new_inode);
} else { } else {
ext4_inc_count(handle, new_dir); ext4_inc_count(handle, new_dir);
ext4_update_dx_flag(new_dir); ext4_update_dx_flag(new_dir);

4
fs/fat/inode.c
View File

@ -379,7 +379,7 @@ static int fat_fill_inode(struct inode *inode, struct msdos_dir_entry *de)
return error; return error;
MSDOS_I(inode)->mmu_private = inode->i_size; MSDOS_I(inode)->mmu_private = inode->i_size;
inode->i_nlink = fat_subdirs(inode); set_nlink(inode, fat_subdirs(inode));
} else { /* not a directory */ } else { /* not a directory */
inode->i_generation |= 1; inode->i_generation |= 1;
inode->i_mode = fat_make_mode(sbi, de->attr, inode->i_mode = fat_make_mode(sbi, de->attr,
@ -1233,7 +1233,7 @@ static int fat_read_root(struct inode *inode)
fat_save_attrs(inode, ATTR_DIR); fat_save_attrs(inode, ATTR_DIR);
inode->i_mtime.tv_sec = inode->i_atime.tv_sec = inode->i_ctime.tv_sec = 0; inode->i_mtime.tv_sec = inode->i_atime.tv_sec = inode->i_ctime.tv_sec = 0;
inode->i_mtime.tv_nsec = inode->i_atime.tv_nsec = inode->i_ctime.tv_nsec = 0; inode->i_mtime.tv_nsec = inode->i_atime.tv_nsec = inode->i_ctime.tv_nsec = 0;
inode->i_nlink = fat_subdirs(inode)+2; set_nlink(inode, fat_subdirs(inode)+2);
return 0; return 0;
} }

2
fs/fat/namei_msdos.c
View File

@ -387,7 +387,7 @@ static int msdos_mkdir(struct inode *dir, struct dentry *dentry, int mode)
/* the directory was completed, just return a error */ /* the directory was completed, just return a error */
goto out; goto out;
} }
inode->i_nlink = 2; set_nlink(inode, 2);
inode->i_mtime = inode->i_atime = inode->i_ctime = ts; inode->i_mtime = inode->i_atime = inode->i_ctime = ts;
/* timestamp is already written, so mark_inode_dirty() is unneeded. */ /* timestamp is already written, so mark_inode_dirty() is unneeded. */

2
fs/fat/namei_vfat.c
View File

@ -900,7 +900,7 @@ static int vfat_mkdir(struct inode *dir, struct dentry *dentry, int mode)
goto out; goto out;
} }
inode->i_version++; inode->i_version++;
inode->i_nlink = 2; set_nlink(inode, 2);
inode->i_mtime = inode->i_atime = inode->i_ctime = ts; inode->i_mtime = inode->i_atime = inode->i_ctime = ts;
/* timestamp is already written, so mark_inode_dirty() is unneeded. */ /* timestamp is already written, so mark_inode_dirty() is unneeded. */

2
fs/freevxfs/vxfs_inode.c
View File

@ -227,7 +227,7 @@ vxfs_iinit(struct inode *ip, struct vxfs_inode_info *vip)
ip->i_uid = (uid_t)vip->vii_uid; ip->i_uid = (uid_t)vip->vii_uid;
ip->i_gid = (gid_t)vip->vii_gid; ip->i_gid = (gid_t)vip->vii_gid;
ip->i_nlink = vip->vii_nlink; set_nlink(ip, vip->vii_nlink);
ip->i_size = vip->vii_size; ip->i_size = vip->vii_size;
ip->i_atime.tv_sec = vip->vii_atime; ip->i_atime.tv_sec = vip->vii_atime;

2
fs/fuse/control.c
View File

@ -231,7 +231,7 @@ static struct dentry *fuse_ctl_add_dentry(struct dentry *parent,
if (iop) if (iop)
inode->i_op = iop; inode->i_op = iop;
inode->i_fop = fop; inode->i_fop = fop;
inode->i_nlink = nlink; set_nlink(inode, nlink);
inode->i_private = fc; inode->i_private = fc;
d_add(dentry, inode); d_add(dentry, inode);
return dentry; return dentry;

2
fs/fuse/inode.c
View File

@ -151,7 +151,7 @@ void fuse_change_attributes_common(struct inode *inode, struct fuse_attr *attr,
inode->i_ino = attr->ino; inode->i_ino = attr->ino;
inode->i_mode = (inode->i_mode & S_IFMT) | (attr->mode & 07777); inode->i_mode = (inode->i_mode & S_IFMT) | (attr->mode & 07777);
inode->i_nlink = attr->nlink; set_nlink(inode, attr->nlink);
inode->i_uid = attr->uid; inode->i_uid = attr->uid;
inode->i_gid = attr->gid; inode->i_gid = attr->gid;
inode->i_blocks = attr->blocks; inode->i_blocks = attr->blocks;

2
fs/gfs2/glops.c
View File

@ -299,7 +299,7 @@ static void gfs2_set_nlink(struct inode *inode, u32 nlink)
if (nlink == 0) if (nlink == 0)
clear_nlink(inode); clear_nlink(inode);
else else
inode->i_nlink = nlink; set_nlink(inode, nlink);
} }
} }

4
fs/hfs/dir.c
View File

@ -198,7 +198,7 @@ static int hfs_create(struct inode *dir, struct dentry *dentry, int mode,
res = hfs_cat_create(inode->i_ino, dir, &dentry->d_name, inode); res = hfs_cat_create(inode->i_ino, dir, &dentry->d_name, inode);
if (res) { if (res) {
inode->i_nlink = 0; clear_nlink(inode);
hfs_delete_inode(inode); hfs_delete_inode(inode);
iput(inode); iput(inode);
return res; return res;
@ -227,7 +227,7 @@ static int hfs_mkdir(struct inode *dir, struct dentry *dentry, int mode)
res = hfs_cat_create(inode->i_ino, dir, &dentry->d_name, inode); res = hfs_cat_create(inode->i_ino, dir, &dentry->d_name, inode);
if (res) { if (res) {
inode->i_nlink = 0; clear_nlink(inode);
hfs_delete_inode(inode); hfs_delete_inode(inode);
iput(inode); iput(inode);
return res; return res;

4
fs/hfs/inode.c
View File

@ -183,7 +183,7 @@ struct inode *hfs_new_inode(struct inode *dir, struct qstr *name, int mode)
inode->i_mode = mode; inode->i_mode = mode;
inode->i_uid = current_fsuid(); inode->i_uid = current_fsuid();
inode->i_gid = current_fsgid(); inode->i_gid = current_fsgid();
inode->i_nlink = 1; set_nlink(inode, 1);
inode->i_mtime = inode->i_atime = inode->i_ctime = CURRENT_TIME_SEC; inode->i_mtime = inode->i_atime = inode->i_ctime = CURRENT_TIME_SEC;
HFS_I(inode)->flags = 0; HFS_I(inode)->flags = 0;
HFS_I(inode)->rsrc_inode = NULL; HFS_I(inode)->rsrc_inode = NULL;
@ -313,7 +313,7 @@ static int hfs_read_inode(struct inode *inode, void *data)
/* Initialize the inode */ /* Initialize the inode */
inode->i_uid = hsb->s_uid; inode->i_uid = hsb->s_uid;
inode->i_gid = hsb->s_gid; inode->i_gid = hsb->s_gid;
inode->i_nlink = 1; set_nlink(inode, 1);
if (idata->key) if (idata->key)
HFS_I(inode)->cat_key = *idata->key; HFS_I(inode)->cat_key = *idata->key;

4
fs/hfsplus/dir.c
View File

@ -415,7 +415,7 @@ static int hfsplus_symlink(struct inode *dir, struct dentry *dentry,
goto out; goto out;
out_err: out_err:
inode->i_nlink = 0; clear_nlink(inode);
hfsplus_delete_inode(inode); hfsplus_delete_inode(inode);
iput(inode); iput(inode);
out: out:
@ -440,7 +440,7 @@ static int hfsplus_mknod(struct inode *dir, struct dentry *dentry,
res = hfsplus_create_cat(inode->i_ino, dir, &dentry->d_name, inode); res = hfsplus_create_cat(inode->i_ino, dir, &dentry->d_name, inode);
if (res) { if (res) {
inode->i_nlink = 0; clear_nlink(inode);
hfsplus_delete_inode(inode); hfsplus_delete_inode(inode);
iput(inode); iput(inode);
goto out; goto out;

10
fs/hfsplus/inode.c
View File

@ -391,7 +391,7 @@ struct inode *hfsplus_new_inode(struct super_block *sb, int mode)
inode->i_mode = mode; inode->i_mode = mode;
inode->i_uid = current_fsuid(); inode->i_uid = current_fsuid();
inode->i_gid = current_fsgid(); inode->i_gid = current_fsgid();
inode->i_nlink = 1; set_nlink(inode, 1);
inode->i_mtime = inode->i_atime = inode->i_ctime = CURRENT_TIME_SEC; inode->i_mtime = inode->i_atime = inode->i_ctime = CURRENT_TIME_SEC;
hip = HFSPLUS_I(inode); hip = HFSPLUS_I(inode);
@ -512,7 +512,7 @@ int hfsplus_cat_read_inode(struct inode *inode, struct hfs_find_data *fd)
hfs_bnode_read(fd->bnode, &entry, fd->entryoffset, hfs_bnode_read(fd->bnode, &entry, fd->entryoffset,
sizeof(struct hfsplus_cat_folder)); sizeof(struct hfsplus_cat_folder));
hfsplus_get_perms(inode, &folder->permissions, 1); hfsplus_get_perms(inode, &folder->permissions, 1);
inode->i_nlink = 1; set_nlink(inode, 1);
inode->i_size = 2 + be32_to_cpu(folder->valence); inode->i_size = 2 + be32_to_cpu(folder->valence);
inode->i_atime = hfsp_mt2ut(folder->access_date); inode->i_atime = hfsp_mt2ut(folder->access_date);
inode->i_mtime = hfsp_mt2ut(folder->content_mod_date); 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)
hfsplus_inode_read_fork(inode, HFSPLUS_IS_RSRC(inode) ? hfsplus_inode_read_fork(inode, HFSPLUS_IS_RSRC(inode) ?
&file->rsrc_fork : &file->data_fork); &file->rsrc_fork : &file->data_fork);
hfsplus_get_perms(inode, &file->permissions, 0); hfsplus_get_perms(inode, &file->permissions, 0);
inode->i_nlink = 1; set_nlink(inode, 1);
if (S_ISREG(inode->i_mode)) { if (S_ISREG(inode->i_mode)) {
if (file->permissions.dev) if (file->permissions.dev)
inode->i_nlink = set_nlink(inode,
be32_to_cpu(file->permissions.dev); be32_to_cpu(file->permissions.dev));
inode->i_op = &hfsplus_file_inode_operations; inode->i_op = &hfsplus_file_inode_operations;
inode->i_fop = &hfsplus_file_operations; inode->i_fop = &hfsplus_file_operations;
inode->i_mapping->a_ops = &hfsplus_aops; inode->i_mapping->a_ops = &hfsplus_aops;

2
fs/hostfs/hostfs_kern.c
View File

@ -541,7 +541,7 @@ static int read_name(struct inode *ino, char *name)
ino->i_ino = st.ino; ino->i_ino = st.ino;
ino->i_mode = st.mode; ino->i_mode = st.mode;
ino->i_nlink = st.nlink; set_nlink(ino, st.nlink);
ino->i_uid = st.uid; ino->i_uid = st.uid;
ino->i_gid = st.gid; ino->i_gid = st.gid;
ino->i_atime = st.atime; ino->i_atime = st.atime;

2
fs/hpfs/dir.c
View File

@ -247,7 +247,7 @@ struct dentry *hpfs_lookup(struct inode *dir, struct dentry *dentry, struct name
result->i_mode &= ~0111; result->i_mode &= ~0111;
result->i_op = &hpfs_file_iops; result->i_op = &hpfs_file_iops;
result->i_fop = &hpfs_file_ops; result->i_fop = &hpfs_file_ops;
result->i_nlink = 1; set_nlink(result, 1);
} }
unlock_new_inode(result); unlock_new_inode(result);
} }

10
fs/hpfs/inode.c
View File

@ -53,7 +53,7 @@ void hpfs_read_inode(struct inode *i)
i->i_mode &= ~0111; i->i_mode &= ~0111;
i->i_op = &hpfs_file_iops; i->i_op = &hpfs_file_iops;
i->i_fop = &hpfs_file_ops; i->i_fop = &hpfs_file_ops;
i->i_nlink = 0;*/ clear_nlink(i);*/
make_bad_inode(i); make_bad_inode(i);
return; return;
} }
@ -77,7 +77,7 @@ void hpfs_read_inode(struct inode *i)
i->i_mode = S_IFLNK | 0777; i->i_mode = S_IFLNK | 0777;
i->i_op = &page_symlink_inode_operations; i->i_op = &page_symlink_inode_operations;
i->i_data.a_ops = &hpfs_symlink_aops; i->i_data.a_ops = &hpfs_symlink_aops;
i->i_nlink = 1; set_nlink(i, 1);
i->i_size = ea_size; i->i_size = ea_size;
i->i_blocks = 1; i->i_blocks = 1;
brelse(bh); brelse(bh);
@ -101,7 +101,7 @@ void hpfs_read_inode(struct inode *i)
} }
if (S_ISBLK(mode) || S_ISCHR(mode) || S_ISFIFO(mode) || S_ISSOCK(mode)) { if (S_ISBLK(mode) || S_ISCHR(mode) || S_ISFIFO(mode) || S_ISSOCK(mode)) {
brelse(bh); brelse(bh);
i->i_nlink = 1; set_nlink(i, 1);
i->i_size = 0; i->i_size = 0;
i->i_blocks = 1; i->i_blocks = 1;
init_special_inode(i, mode, init_special_inode(i, mode,
@ -125,13 +125,13 @@ void hpfs_read_inode(struct inode *i)
hpfs_count_dnodes(i->i_sb, hpfs_inode->i_dno, &n_dnodes, &n_subdirs, NULL); hpfs_count_dnodes(i->i_sb, hpfs_inode->i_dno, &n_dnodes, &n_subdirs, NULL);
i->i_blocks = 4 * n_dnodes; i->i_blocks = 4 * n_dnodes;
i->i_size = 2048 * n_dnodes; i->i_size = 2048 * n_dnodes;
i->i_nlink = 2 + n_subdirs; set_nlink(i, 2 + n_subdirs);
} else { } else {
i->i_mode |= S_IFREG; i->i_mode |= S_IFREG;
if (!hpfs_inode->i_ea_mode) i->i_mode &= ~0111; if (!hpfs_inode->i_ea_mode) i->i_mode &= ~0111;
i->i_op = &hpfs_file_iops; i->i_op = &hpfs_file_iops;
i->i_fop = &hpfs_file_ops; i->i_fop = &hpfs_file_ops;
i->i_nlink = 1; set_nlink(i, 1);
i->i_size = le32_to_cpu(fnode->file_size); i->i_size = le32_to_cpu(fnode->file_size);
i->i_blocks = ((i->i_size + 511) >> 9) + 1; i->i_blocks = ((i->i_size + 511) >> 9) + 1;
i->i_data.a_ops = &hpfs_aops; i->i_data.a_ops = &hpfs_aops;

8
fs/hpfs/namei.c
View File

@ -56,7 +56,7 @@ static int hpfs_mkdir(struct inode *dir, struct dentry *dentry, int mode)
result->i_fop = &hpfs_dir_ops; result->i_fop = &hpfs_dir_ops;
result->i_blocks = 4; result->i_blocks = 4;
result->i_size = 2048; result->i_size = 2048;
result->i_nlink = 2; set_nlink(result, 2);
if (dee.read_only) if (dee.read_only)
result->i_mode &= ~0222; result->i_mode &= ~0222;
@ -150,7 +150,7 @@ static int hpfs_create(struct inode *dir, struct dentry *dentry, int mode, struc
result->i_mode &= ~0111; result->i_mode &= ~0111;
result->i_op = &hpfs_file_iops; result->i_op = &hpfs_file_iops;
result->i_fop = &hpfs_file_ops; result->i_fop = &hpfs_file_ops;
result->i_nlink = 1; set_nlink(result, 1);
hpfs_i(result)->i_parent_dir = dir->i_ino; hpfs_i(result)->i_parent_dir = dir->i_ino;
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)); 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));
result->i_ctime.tv_nsec = 0; result->i_ctime.tv_nsec = 0;
@ -242,7 +242,7 @@ static int hpfs_mknod(struct inode *dir, struct dentry *dentry, int mode, dev_t
hpfs_i(result)->i_ea_size = 0; hpfs_i(result)->i_ea_size = 0;
result->i_uid = current_fsuid(); result->i_uid = current_fsuid();
result->i_gid = current_fsgid(); result->i_gid = current_fsgid();
result->i_nlink = 1; set_nlink(result, 1);
result->i_size = 0; result->i_size = 0;
result->i_blocks = 1; result->i_blocks = 1;
init_special_inode(result, mode, rdev); init_special_inode(result, mode, rdev);
@ -318,7 +318,7 @@ static int hpfs_symlink(struct inode *dir, struct dentry *dentry, const char *sy
result->i_uid = current_fsuid(); result->i_uid = current_fsuid();
result->i_gid = current_fsgid(); result->i_gid = current_fsgid();
result->i_blocks = 1; result->i_blocks = 1;
result->i_nlink = 1; set_nlink(result, 1);
result->i_size = strlen(symlink); result->i_size = strlen(symlink);
result->i_op = &page_symlink_inode_operations; result->i_op = &page_symlink_inode_operations;
result->i_data.a_ops = &hpfs_symlink_aops; result->i_data.a_ops = &hpfs_symlink_aops;

2
fs/hppfs/hppfs.c
View File

@ -702,7 +702,7 @@ static struct inode *get_inode(struct super_block *sb, struct dentry *dentry)
inode->i_ctime = proc_ino->i_ctime; inode->i_ctime = proc_ino->i_ctime;
inode->i_ino = proc_ino->i_ino; inode->i_ino = proc_ino->i_ino;
inode->i_mode = proc_ino->i_mode; inode->i_mode = proc_ino->i_mode;
inode->i_nlink = proc_ino->i_nlink; set_nlink(inode, proc_ino->i_nlink);
inode->i_size = proc_ino->i_size; inode->i_size = proc_ino->i_size;
inode->i_blocks = proc_ino->i_blocks; inode->i_blocks = proc_ino->i_blocks;

2
fs/hugetlbfs/inode.c
View File

@ -970,7 +970,7 @@ struct file *hugetlb_file_setup(const char *name, size_t size,
d_instantiate(path.dentry, inode); d_instantiate(path.dentry, inode);
inode->i_size = size; inode->i_size = size;
inode->i_nlink = 0; clear_nlink(inode);
error = -ENFILE; error = -ENFILE;
file = alloc_file(&path, FMODE_WRITE | FMODE_READ, file = alloc_file(&path, FMODE_WRITE | FMODE_READ,

2
fs/inode.c
View File

@ -142,7 +142,7 @@ int inode_init_always(struct super_block *sb, struct inode *inode)
atomic_set(&inode->i_count, 1); atomic_set(&inode->i_count, 1);
inode->i_op = &empty_iops; inode->i_op = &empty_iops;
inode->i_fop = &empty_fops; inode->i_fop = &empty_fops;
inode->i_nlink = 1; inode->__i_nlink = 1;
inode->i_opflags = 0; inode->i_opflags = 0;
inode->i_uid = 0; inode->i_uid = 0;
inode->i_gid = 0; inode->i_gid = 0;

4
fs/isofs/inode.c
View File

@ -1319,7 +1319,7 @@ static int isofs_read_inode(struct inode *inode)
inode->i_mode = S_IFDIR | sbi->s_dmode; inode->i_mode = S_IFDIR | sbi->s_dmode;
else else
inode->i_mode = S_IFDIR | S_IRUGO | S_IXUGO; inode->i_mode = S_IFDIR | S_IRUGO | S_IXUGO;
inode->i_nlink = 1; /* set_nlink(inode, 1); /*
* Set to 1. We know there are 2, but * Set to 1. We know there are 2, but
* the find utility tries to optimize * the find utility tries to optimize
* if it is 2, and it screws up. It is * if it is 2, and it screws up. It is
@ -1337,7 +1337,7 @@ static int isofs_read_inode(struct inode *inode)
*/ */
inode->i_mode = S_IFREG | S_IRUGO | S_IXUGO; inode->i_mode = S_IFREG | S_IRUGO | S_IXUGO;
} }
inode->i_nlink = 1; set_nlink(inode, 1);
} }
inode->i_uid = sbi->s_uid; inode->i_uid = sbi->s_uid;
inode->i_gid = sbi->s_gid; inode->i_gid = sbi->s_gid;

4
fs/isofs/rock.c
View File

@ -363,7 +363,7 @@ parse_rock_ridge_inode_internal(struct iso_directory_record *de,
break; break;
case SIG('P', 'X'): case SIG('P', 'X'):
inode->i_mode = isonum_733(rr->u.PX.mode); inode->i_mode = isonum_733(rr->u.PX.mode);
inode->i_nlink = isonum_733(rr->u.PX.n_links); set_nlink(inode, isonum_733(rr->u.PX.n_links));
inode->i_uid = isonum_733(rr->u.PX.uid); inode->i_uid = isonum_733(rr->u.PX.uid);
inode->i_gid = isonum_733(rr->u.PX.gid); inode->i_gid = isonum_733(rr->u.PX.gid);
break; break;
@ -496,7 +496,7 @@ parse_rock_ridge_inode_internal(struct iso_directory_record *de,
goto out; goto out;
} }
inode->i_mode = reloc->i_mode; inode->i_mode = reloc->i_mode;
inode->i_nlink = reloc->i_nlink; set_nlink(inode, reloc->i_nlink);
inode->i_uid = reloc->i_uid; inode->i_uid = reloc->i_uid;
inode->i_gid = reloc->i_gid; inode->i_gid = reloc->i_gid;
inode->i_rdev = reloc->i_rdev; inode->i_rdev = reloc->i_rdev;

6
fs/jffs2/dir.c
View File

@ -245,7 +245,7 @@ static int jffs2_unlink(struct inode *dir_i, struct dentry *dentry)
ret = jffs2_do_unlink(c, dir_f, dentry->d_name.name, ret = jffs2_do_unlink(c, dir_f, dentry->d_name.name,
dentry->d_name.len, dead_f, now); dentry->d_name.len, dead_f, now);
if (dead_f->inocache) if (dead_f->inocache)
dentry->d_inode->i_nlink = dead_f->inocache->pino_nlink; set_nlink(dentry->d_inode, dead_f->inocache->pino_nlink);
if (!ret) if (!ret)
dir_i->i_mtime = dir_i->i_ctime = ITIME(now); dir_i->i_mtime = dir_i->i_ctime = ITIME(now);
return ret; return ret;
@ -278,7 +278,7 @@ static int jffs2_link (struct dentry *old_dentry, struct inode *dir_i, struct de
if (!ret) { if (!ret) {
mutex_lock(&f->sem); mutex_lock(&f->sem);
old_dentry->d_inode->i_nlink = ++f->inocache->pino_nlink; set_nlink(old_dentry->d_inode, ++f->inocache->pino_nlink);
mutex_unlock(&f->sem); mutex_unlock(&f->sem);
d_instantiate(dentry, old_dentry->d_inode); d_instantiate(dentry, old_dentry->d_inode);
dir_i->i_mtime = dir_i->i_ctime = ITIME(now); 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)
f = JFFS2_INODE_INFO(inode); f = JFFS2_INODE_INFO(inode);
/* Directories get nlink 2 at start */ /* Directories get nlink 2 at start */
inode->i_nlink = 2; set_nlink(inode, 2);
/* but ic->pino_nlink is the parent ino# */ /* but ic->pino_nlink is the parent ino# */
f->inocache->pino_nlink = dir_i->i_ino; f->inocache->pino_nlink = dir_i->i_ino;

6
fs/jffs2/fs.c
View File

@ -278,7 +278,7 @@ struct inode *jffs2_iget(struct super_block *sb, unsigned long ino)
inode->i_mtime = ITIME(je32_to_cpu(latest_node.mtime)); inode->i_mtime = ITIME(je32_to_cpu(latest_node.mtime));
inode->i_ctime = ITIME(je32_to_cpu(latest_node.ctime)); inode->i_ctime = ITIME(je32_to_cpu(latest_node.ctime));
inode->i_nlink = f->inocache->pino_nlink; set_nlink(inode, f->inocache->pino_nlink);
inode->i_blocks = (inode->i_size + 511) >> 9; inode->i_blocks = (inode->i_size + 511) >> 9;
@ -291,7 +291,7 @@ struct inode *jffs2_iget(struct super_block *sb, unsigned long ino)
case S_IFDIR: case S_IFDIR:
{ {
struct jffs2_full_dirent *fd; struct jffs2_full_dirent *fd;
inode->i_nlink = 2; /* parent and '.' */ set_nlink(inode, 2); /* parent and '.' */
for (fd=f->dents; fd; fd = fd->next) { for (fd=f->dents; fd; fd = fd->next) {
if (fd->type == DT_DIR && fd->ino) 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
iput(inode); iput(inode);
return ERR_PTR(ret); return ERR_PTR(ret);
} }
inode->i_nlink = 1; set_nlink(inode, 1);
inode->i_ino = je32_to_cpu(ri->ino); inode->i_ino = je32_to_cpu(ri->ino);
inode->i_mode = jemode_to_cpu(ri->mode); inode->i_mode = jemode_to_cpu(ri->mode);
inode->i_gid = je16_to_cpu(ri->gid); inode->i_gid = je16_to_cpu(ri->gid);

6
fs/jfs/jfs_imap.c
View File

@ -457,7 +457,7 @@ struct inode *diReadSpecial(struct super_block *sb, ino_t inum, int secondary)
/* read the page of fixed disk inode (AIT) in raw mode */ /* read the page of fixed disk inode (AIT) in raw mode */
mp = read_metapage(ip, address << sbi->l2nbperpage, PSIZE, 1); mp = read_metapage(ip, address << sbi->l2nbperpage, PSIZE, 1);
if (mp == NULL) { if (mp == NULL) {
ip->i_nlink = 1; /* Don't want iput() deleting it */ set_nlink(ip, 1); /* Don't want iput() deleting it */
iput(ip); iput(ip);
return (NULL); return (NULL);
} }
@ -469,7 +469,7 @@ struct inode *diReadSpecial(struct super_block *sb, ino_t inum, int secondary)
/* copy on-disk inode to in-memory inode */ /* copy on-disk inode to in-memory inode */
if ((copy_from_dinode(dp, ip)) != 0) { if ((copy_from_dinode(dp, ip)) != 0) {
/* handle bad return by returning NULL for ip */ /* handle bad return by returning NULL for ip */
ip->i_nlink = 1; /* Don't want iput() deleting it */ set_nlink(ip, 1); /* Don't want iput() deleting it */
iput(ip); iput(ip);
/* release the page */ /* release the page */
release_metapage(mp); release_metapage(mp);
@ -3076,7 +3076,7 @@ static int copy_from_dinode(struct dinode * dip, struct inode *ip)
ip->i_mode |= 0001; ip->i_mode |= 0001;
} }
} }
ip->i_nlink = le32_to_cpu(dip->di_nlink); set_nlink(ip, le32_to_cpu(dip->di_nlink));
jfs_ip->saved_uid = le32_to_cpu(dip->di_uid); jfs_ip->saved_uid = le32_to_cpu(dip->di_uid);
if (sbi->uid == -1) if (sbi->uid == -1)

2
fs/jfs/jfs_inode.c
View File

@ -157,7 +157,7 @@ struct inode *ialloc(struct inode *parent, umode_t mode)
dquot_drop(inode); dquot_drop(inode);
inode->i_flags |= S_NOQUOTA; inode->i_flags |= S_NOQUOTA;
fail_unlock: fail_unlock:
inode->i_nlink = 0; clear_nlink(inode);
unlock_new_inode(inode); unlock_new_inode(inode);
fail_put: fail_put:
iput(inode); iput(inode);

12
fs/jfs/namei.c
View File

@ -172,7 +172,7 @@ static int jfs_create(struct inode *dip, struct dentry *dentry, int mode,
mutex_unlock(&JFS_IP(dip)->commit_mutex); mutex_unlock(&JFS_IP(dip)->commit_mutex);
if (rc) { if (rc) {
free_ea_wmap(ip); free_ea_wmap(ip);
ip->i_nlink = 0; clear_nlink(ip);
unlock_new_inode(ip); unlock_new_inode(ip);
iput(ip); iput(ip);
} else { } else {
@ -292,7 +292,7 @@ static int jfs_mkdir(struct inode *dip, struct dentry *dentry, int mode)
goto out3; goto out3;
} }
ip->i_nlink = 2; /* for '.' */ set_nlink(ip, 2); /* for '.' */
ip->i_op = &jfs_dir_inode_operations; ip->i_op = &jfs_dir_inode_operations;
ip->i_fop = &jfs_dir_operations; ip->i_fop = &jfs_dir_operations;
@ -311,7 +311,7 @@ static int jfs_mkdir(struct inode *dip, struct dentry *dentry, int mode)
mutex_unlock(&JFS_IP(dip)->commit_mutex); mutex_unlock(&JFS_IP(dip)->commit_mutex);
if (rc) { if (rc) {
free_ea_wmap(ip); free_ea_wmap(ip);
ip->i_nlink = 0; clear_nlink(ip);
unlock_new_inode(ip); unlock_new_inode(ip);
iput(ip); iput(ip);
} else { } else {
@ -844,7 +844,7 @@ static int jfs_link(struct dentry *old_dentry,
rc = txCommit(tid, 2, &iplist[0], 0); rc = txCommit(tid, 2, &iplist[0], 0);
if (rc) { if (rc) {
ip->i_nlink--; /* never instantiated */ drop_nlink(ip); /* never instantiated */
iput(ip); iput(ip);
} else } else
d_instantiate(dentry, ip); d_instantiate(dentry, ip);
@ -1048,7 +1048,7 @@ static int jfs_symlink(struct inode *dip, struct dentry *dentry,
mutex_unlock(&JFS_IP(dip)->commit_mutex); mutex_unlock(&JFS_IP(dip)->commit_mutex);
if (rc) { if (rc) {
free_ea_wmap(ip); free_ea_wmap(ip);
ip->i_nlink = 0; clear_nlink(ip);
unlock_new_inode(ip); unlock_new_inode(ip);
iput(ip); iput(ip);
} else { } else {
@ -1433,7 +1433,7 @@ static int jfs_mknod(struct inode *dir, struct dentry *dentry,
mutex_unlock(&JFS_IP(dir)->commit_mutex); mutex_unlock(&JFS_IP(dir)->commit_mutex);
if (rc) { if (rc) {
free_ea_wmap(ip); free_ea_wmap(ip);
ip->i_nlink = 0; clear_nlink(ip);
unlock_new_inode(ip); unlock_new_inode(ip);
iput(ip); iput(ip);
} else { } else {

1
fs/jfs/super.c
View File

@ -485,7 +485,6 @@ static int jfs_fill_super(struct super_block *sb, void *data, int silent)
goto out_unload; goto out_unload;
} }
inode->i_ino = 0; inode->i_ino = 0;
inode->i_nlink = 1;
inode->i_size = sb->s_bdev->bd_inode->i_size; inode->i_size = sb->s_bdev->bd_inode->i_size;
inode->i_mapping->a_ops = &jfs_metapage_aops; inode->i_mapping->a_ops = &jfs_metapage_aops;
insert_inode_hash(inode); insert_inode_hash(inode);

6
fs/libfs.c
View File

@ -490,7 +490,7 @@ int simple_fill_super(struct super_block *s, unsigned long magic,
inode->i_atime = inode->i_mtime = inode->i_ctime = CURRENT_TIME; inode->i_atime = inode->i_mtime = inode->i_ctime = CURRENT_TIME;
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;
inode->i_nlink = 2; set_nlink(inode, 2);
root = d_alloc_root(inode); root = d_alloc_root(inode);
if (!root) { if (!root) {
iput(inode); iput(inode);
@ -510,8 +510,10 @@ int simple_fill_super(struct super_block *s, unsigned long magic,
if (!dentry) if (!dentry)
goto out; goto out;
inode = new_inode(s); inode = new_inode(s);
if (!inode) if (!inode) {
dput(dentry);
goto out; goto out;
}
inode->i_mode = S_IFREG | files->mode; inode->i_mode = S_IFREG | files->mode;
inode->i_atime = inode->i_mtime = inode->i_ctime = CURRENT_TIME; inode->i_atime = inode->i_mtime = inode->i_ctime = CURRENT_TIME;
inode->i_fop = files->ops; inode->i_fop = files->ops;

8
fs/logfs/dir.c
View File

@ -197,7 +197,7 @@ static int logfs_remove_inode(struct inode *inode)
{ {
int ret; int ret;
inode->i_nlink--; drop_nlink(inode);
ret = write_inode(inode); ret = write_inode(inode);
LOGFS_BUG_ON(ret, inode->i_sb); LOGFS_BUG_ON(ret, inode->i_sb);
return ret; return ret;
@ -433,7 +433,7 @@ static int __logfs_create(struct inode *dir, struct dentry *dentry,
ta = kzalloc(sizeof(*ta), GFP_KERNEL); ta = kzalloc(sizeof(*ta), GFP_KERNEL);
if (!ta) { if (!ta) {
inode->i_nlink--; drop_nlink(inode);
iput(inode); iput(inode);
return -ENOMEM; return -ENOMEM;
} }
@ -456,7 +456,7 @@ static int __logfs_create(struct inode *dir, struct dentry *dentry,
abort_transaction(inode, ta); abort_transaction(inode, ta);
li->li_flags |= LOGFS_IF_STILLBORN; li->li_flags |= LOGFS_IF_STILLBORN;
/* FIXME: truncate symlink */ /* FIXME: truncate symlink */
inode->i_nlink--; drop_nlink(inode);
iput(inode); iput(inode);
goto out; goto out;
} }
@ -563,7 +563,7 @@ static int logfs_link(struct dentry *old_dentry, struct inode *dir,
inode->i_ctime = dir->i_ctime = dir->i_mtime = CURRENT_TIME; inode->i_ctime = dir->i_ctime = dir->i_mtime = CURRENT_TIME;
ihold(inode); ihold(inode);
inode->i_nlink++; inc_nlink(inode);
mark_inode_dirty_sync(inode); mark_inode_dirty_sync(inode);
return __logfs_create(dir, dentry, inode, NULL, 0); return __logfs_create(dir, dentry, inode, NULL, 0);

3
fs/logfs/inode.c
View File

@ -93,7 +93,7 @@ static struct inode *__logfs_iget(struct super_block *sb, ino_t ino)
/* inode->i_nlink == 0 can be true when called from /* inode->i_nlink == 0 can be true when called from
* block validator */ * block validator */
/* set i_nlink to 0 to prevent caching */ /* set i_nlink to 0 to prevent caching */
inode->i_nlink = 0; clear_nlink(inode);
logfs_inode(inode)->li_flags |= LOGFS_IF_ZOMBIE; logfs_inode(inode)->li_flags |= LOGFS_IF_ZOMBIE;
iget_failed(inode); iget_failed(inode);
if (!err) if (!err)
@ -199,7 +199,6 @@ static void logfs_init_inode(struct super_block *sb, struct inode *inode)
inode->i_blocks = 0; inode->i_blocks = 0;
inode->i_ctime = CURRENT_TIME; inode->i_ctime = CURRENT_TIME;
inode->i_mtime = CURRENT_TIME; inode->i_mtime = CURRENT_TIME;
inode->i_nlink = 1;
li->li_refcount = 1; li->li_refcount = 1;
INIT_LIST_HEAD(&li->li_freeing_list); INIT_LIST_HEAD(&li->li_freeing_list);

2
fs/logfs/readwrite.c
View File

@ -126,7 +126,7 @@ static void logfs_disk_to_inode(struct logfs_disk_inode *di, struct inode*inode)
inode->i_atime = be64_to_timespec(di->di_atime); inode->i_atime = be64_to_timespec(di->di_atime);
inode->i_ctime = be64_to_timespec(di->di_ctime); inode->i_ctime = be64_to_timespec(di->di_ctime);
inode->i_mtime = be64_to_timespec(di->di_mtime); inode->i_mtime = be64_to_timespec(di->di_mtime);
inode->i_nlink = be32_to_cpu(di->di_refcount); set_nlink(inode, be32_to_cpu(di->di_refcount));
inode->i_generation = be32_to_cpu(di->di_generation); inode->i_generation = be32_to_cpu(di->di_generation);
switch (inode->i_mode & S_IFMT) { switch (inode->i_mode & S_IFMT) {

4
fs/minix/inode.c
View File

@ -446,7 +446,7 @@ static struct inode *V1_minix_iget(struct inode *inode)
inode->i_mode = raw_inode->i_mode; inode->i_mode = raw_inode->i_mode;
inode->i_uid = (uid_t)raw_inode->i_uid; inode->i_uid = (uid_t)raw_inode->i_uid;
inode->i_gid = (gid_t)raw_inode->i_gid; inode->i_gid = (gid_t)raw_inode->i_gid;
inode->i_nlink = raw_inode->i_nlinks; set_nlink(inode, raw_inode->i_nlinks);
inode->i_size = raw_inode->i_size; inode->i_size = raw_inode->i_size;
inode->i_mtime.tv_sec = inode->i_atime.tv_sec = inode->i_ctime.tv_sec = raw_inode->i_time; inode->i_mtime.tv_sec = inode->i_atime.tv_sec = inode->i_ctime.tv_sec = raw_inode->i_time;
inode->i_mtime.tv_nsec = 0; inode->i_mtime.tv_nsec = 0;
@ -479,7 +479,7 @@ static struct inode *V2_minix_iget(struct inode *inode)
inode->i_mode = raw_inode->i_mode; inode->i_mode = raw_inode->i_mode;
inode->i_uid = (uid_t)raw_inode->i_uid; inode->i_uid = (uid_t)raw_inode->i_uid;
inode->i_gid = (gid_t)raw_inode->i_gid; inode->i_gid = (gid_t)raw_inode->i_gid;
inode->i_nlink = raw_inode->i_nlinks; set_nlink(inode, raw_inode->i_nlinks);
inode->i_size = raw_inode->i_size; inode->i_size = raw_inode->i_size;
inode->i_mtime.tv_sec = raw_inode->i_mtime; inode->i_mtime.tv_sec = raw_inode->i_mtime;
inode->i_atime.tv_sec = raw_inode->i_atime; inode->i_atime.tv_sec = raw_inode->i_atime;

18
fs/namei.c
View File

@ -137,7 +137,7 @@ static int do_getname(const char __user *filename, char *page)
return retval; return retval;
} }
static char *getname_flags(const char __user * filename, int flags) static char *getname_flags(const char __user *filename, int flags, int *empty)
{ {
char *tmp, *result; char *tmp, *result;
@ -148,6 +148,8 @@ static char *getname_flags(const char __user * filename, int flags)
result = tmp; result = tmp;
if (retval < 0) { if (retval < 0) {
if (retval == -ENOENT && empty)
*empty = 1;
if (retval != -ENOENT || !(flags & LOOKUP_EMPTY)) { if (retval != -ENOENT || !(flags & LOOKUP_EMPTY)) {
__putname(tmp); __putname(tmp);
result = ERR_PTR(retval); result = ERR_PTR(retval);
@ -160,7 +162,7 @@ static char *getname_flags(const char __user * filename, int flags)
char *getname(const char __user * filename) char *getname(const char __user * filename)
{ {
return getname_flags(filename, 0); return getname_flags(filename, 0, 0);
} }
#ifdef CONFIG_AUDITSYSCALL #ifdef CONFIG_AUDITSYSCALL
@ -1798,11 +1800,11 @@ struct dentry *lookup_one_len(const char *name, struct dentry *base, int len)
return __lookup_hash(&this, base, NULL); return __lookup_hash(&this, base, NULL);
} }
int user_path_at(int dfd, const char __user *name, unsigned flags, int user_path_at_empty(int dfd, const char __user *name, unsigned flags,
struct path *path) struct path *path, int *empty)
{ {
struct nameidata nd; struct nameidata nd;
char *tmp = getname_flags(name, flags); char *tmp = getname_flags(name, flags, empty);
int err = PTR_ERR(tmp); int err = PTR_ERR(tmp);
if (!IS_ERR(tmp)) { if (!IS_ERR(tmp)) {
@ -1816,6 +1818,12 @@ int user_path_at(int dfd, const char __user *name, unsigned flags,
return err; return err;
} }
int user_path_at(int dfd, const char __user *name, unsigned flags,
struct path *path)
{
return user_path_at_empty(dfd, name, flags, path, 0);
}
static int user_path_parent(int dfd, const char __user *path, static int user_path_parent(int dfd, const char __user *path,
struct nameidata *nd, char **name) struct nameidata *nd, char **name)
{ {

2
fs/ncpfs/inode.c
View File

@ -228,7 +228,7 @@ static void ncp_set_attr(struct inode *inode, struct ncp_entry_info *nwinfo)
DDPRINTK("ncp_read_inode: inode->i_mode = %u\n", inode->i_mode); DDPRINTK("ncp_read_inode: inode->i_mode = %u\n", inode->i_mode);
inode->i_nlink = 1; set_nlink(inode, 1);
inode->i_uid = server->m.uid; inode->i_uid = server->m.uid;
inode->i_gid = server->m.gid; inode->i_gid = server->m.gid;

6
fs/nfs/inode.c
View File

@ -320,7 +320,7 @@ nfs_fhget(struct super_block *sb, struct nfs_fh *fh, struct nfs_fattr *fattr)
memset(&inode->i_ctime, 0, sizeof(inode->i_ctime)); memset(&inode->i_ctime, 0, sizeof(inode->i_ctime));
inode->i_version = 0; inode->i_version = 0;
inode->i_size = 0; inode->i_size = 0;
inode->i_nlink = 0; clear_nlink(inode);
inode->i_uid = -2; inode->i_uid = -2;
inode->i_gid = -2; inode->i_gid = -2;
inode->i_blocks = 0; inode->i_blocks = 0;
@ -355,7 +355,7 @@ nfs_fhget(struct super_block *sb, struct nfs_fh *fh, struct nfs_fattr *fattr)
| NFS_INO_INVALID_DATA | NFS_INO_INVALID_DATA
| NFS_INO_REVAL_PAGECACHE; | NFS_INO_REVAL_PAGECACHE;
if (fattr->valid & NFS_ATTR_FATTR_NLINK) if (fattr->valid & NFS_ATTR_FATTR_NLINK)
inode->i_nlink = fattr->nlink; set_nlink(inode, fattr->nlink);
else if (nfs_server_capable(inode, NFS_CAP_NLINK)) else if (nfs_server_capable(inode, NFS_CAP_NLINK))
nfsi->cache_validity |= NFS_INO_INVALID_ATTR; nfsi->cache_validity |= NFS_INO_INVALID_ATTR;
if (fattr->valid & NFS_ATTR_FATTR_OWNER) if (fattr->valid & NFS_ATTR_FATTR_OWNER)
@ -1361,7 +1361,7 @@ static int nfs_update_inode(struct inode *inode, struct nfs_fattr *fattr)
invalid |= NFS_INO_INVALID_ATTR; invalid |= NFS_INO_INVALID_ATTR;
if (S_ISDIR(inode->i_mode)) if (S_ISDIR(inode->i_mode))
invalid |= NFS_INO_INVALID_DATA; invalid |= NFS_INO_INVALID_DATA;
inode->i_nlink = fattr->nlink; set_nlink(inode, fattr->nlink);
} }
} else if (server->caps & NFS_CAP_NLINK) } else if (server->caps & NFS_CAP_NLINK)
invalid |= save_cache_validity & (NFS_INO_INVALID_ATTR invalid |= save_cache_validity & (NFS_INO_INVALID_ATTR

4
fs/nilfs2/inode.c
View File

@ -354,7 +354,7 @@ struct inode *nilfs_new_inode(struct inode *dir, int mode)
failed_acl: failed_acl:
failed_bmap: failed_bmap:
inode->i_nlink = 0; clear_nlink(inode);
iput(inode); /* raw_inode will be deleted through iput(inode); /* raw_inode will be deleted through
generic_delete_inode() */ generic_delete_inode() */
goto failed; goto failed;
@ -396,7 +396,7 @@ int nilfs_read_inode_common(struct inode *inode,
inode->i_mode = le16_to_cpu(raw_inode->i_mode); inode->i_mode = le16_to_cpu(raw_inode->i_mode);
inode->i_uid = (uid_t)le32_to_cpu(raw_inode->i_uid); inode->i_uid = (uid_t)le32_to_cpu(raw_inode->i_uid);
inode->i_gid = (gid_t)le32_to_cpu(raw_inode->i_gid); inode->i_gid = (gid_t)le32_to_cpu(raw_inode->i_gid);
inode->i_nlink = le16_to_cpu(raw_inode->i_links_count); set_nlink(inode, le16_to_cpu(raw_inode->i_links_count));
inode->i_size = le64_to_cpu(raw_inode->i_size); inode->i_size = le64_to_cpu(raw_inode->i_size);
inode->i_atime.tv_sec = le64_to_cpu(raw_inode->i_mtime); inode->i_atime.tv_sec = le64_to_cpu(raw_inode->i_mtime);
inode->i_ctime.tv_sec = le64_to_cpu(raw_inode->i_ctime); inode->i_ctime.tv_sec = le64_to_cpu(raw_inode->i_ctime);

2
fs/nilfs2/namei.c
View File

@ -289,7 +289,7 @@ static int nilfs_do_unlink(struct inode *dir, struct dentry *dentry)
nilfs_warning(inode->i_sb, __func__, nilfs_warning(inode->i_sb, __func__,
"deleting nonexistent file (%lu), %d\n", "deleting nonexistent file (%lu), %d\n",
inode->i_ino, inode->i_nlink); inode->i_ino, inode->i_nlink);
inode->i_nlink = 1; set_nlink(inode, 1);
} }
err = nilfs_delete_entry(de, page); err = nilfs_delete_entry(de, page);
if (err) if (err)

8
fs/ntfs/inode.c
View File

@ -612,7 +612,7 @@ static int ntfs_read_locked_inode(struct inode *vi)
* might be tricky due to vfs interactions. Need to think about this * might be tricky due to vfs interactions. Need to think about this
* some more when implementing the unlink command. * some more when implementing the unlink command.
*/ */
vi->i_nlink = le16_to_cpu(m->link_count); set_nlink(vi, le16_to_cpu(m->link_count));
/* /*
* FIXME: Reparse points can have the directory bit set even though * FIXME: Reparse points can have the directory bit set even though
* they would be S_IFLNK. Need to deal with this further below when we * 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)
vi->i_mode &= ~vol->dmask; vi->i_mode &= ~vol->dmask;
/* Things break without this kludge! */ /* Things break without this kludge! */
if (vi->i_nlink > 1) if (vi->i_nlink > 1)
vi->i_nlink = 1; set_nlink(vi, 1);
} else { } else {
vi->i_mode |= S_IFREG; vi->i_mode |= S_IFREG;
/* Apply the file permissions mask set in the mount options. */ /* 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)
vi->i_version = base_vi->i_version; vi->i_version = base_vi->i_version;
vi->i_uid = base_vi->i_uid; vi->i_uid = base_vi->i_uid;
vi->i_gid = base_vi->i_gid; vi->i_gid = base_vi->i_gid;
vi->i_nlink = base_vi->i_nlink; set_nlink(vi, base_vi->i_nlink);
vi->i_mtime = base_vi->i_mtime; vi->i_mtime = base_vi->i_mtime;
vi->i_ctime = base_vi->i_ctime; vi->i_ctime = base_vi->i_ctime;
vi->i_atime = base_vi->i_atime; 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)
vi->i_version = base_vi->i_version; vi->i_version = base_vi->i_version;
vi->i_uid = base_vi->i_uid; vi->i_uid = base_vi->i_uid;
vi->i_gid = base_vi->i_gid; vi->i_gid = base_vi->i_gid;
vi->i_nlink = base_vi->i_nlink; set_nlink(vi, base_vi->i_nlink);
vi->i_mtime = base_vi->i_mtime; vi->i_mtime = base_vi->i_mtime;
vi->i_ctime = base_vi->i_ctime; vi->i_ctime = base_vi->i_ctime;
vi->i_atime = base_vi->i_atime; vi->i_atime = base_vi->i_atime;

4
fs/ocfs2/dir.c
View File

@ -2292,7 +2292,7 @@ static int ocfs2_fill_new_dir_id(struct ocfs2_super *osb,
ocfs2_journal_dirty(handle, di_bh); ocfs2_journal_dirty(handle, di_bh);
i_size_write(inode, size); i_size_write(inode, size);
inode->i_nlink = 2; set_nlink(inode, 2);
inode->i_blocks = ocfs2_inode_sector_count(inode); inode->i_blocks = ocfs2_inode_sector_count(inode);
ret = ocfs2_mark_inode_dirty(handle, inode, di_bh); ret = ocfs2_mark_inode_dirty(handle, inode, di_bh);
@ -2354,7 +2354,7 @@ static int ocfs2_fill_new_dir_el(struct ocfs2_super *osb,
ocfs2_journal_dirty(handle, new_bh); ocfs2_journal_dirty(handle, new_bh);
i_size_write(inode, inode->i_sb->s_blocksize); i_size_write(inode, inode->i_sb->s_blocksize);
inode->i_nlink = 2; set_nlink(inode, 2);
inode->i_blocks = ocfs2_inode_sector_count(inode); inode->i_blocks = ocfs2_inode_sector_count(inode);
status = ocfs2_mark_inode_dirty(handle, inode, fe_bh); status = ocfs2_mark_inode_dirty(handle, inode, fe_bh);
if (status < 0) { if (status < 0) {

2
fs/ocfs2/dlmglue.c
View File

@ -2092,7 +2092,7 @@ static void ocfs2_refresh_inode_from_lvb(struct inode *inode)
inode->i_uid = be32_to_cpu(lvb->lvb_iuid); inode->i_uid = be32_to_cpu(lvb->lvb_iuid);
inode->i_gid = be32_to_cpu(lvb->lvb_igid); inode->i_gid = be32_to_cpu(lvb->lvb_igid);
inode->i_mode = be16_to_cpu(lvb->lvb_imode); inode->i_mode = be16_to_cpu(lvb->lvb_imode);
inode->i_nlink = be16_to_cpu(lvb->lvb_inlink); set_nlink(inode, be16_to_cpu(lvb->lvb_inlink));
ocfs2_unpack_timespec(&inode->i_atime, ocfs2_unpack_timespec(&inode->i_atime,
be64_to_cpu(lvb->lvb_iatime_packed)); be64_to_cpu(lvb->lvb_iatime_packed));
ocfs2_unpack_timespec(&inode->i_mtime, ocfs2_unpack_timespec(&inode->i_mtime,

4
fs/ocfs2/inode.c
View File

@ -291,7 +291,7 @@ void ocfs2_populate_inode(struct inode *inode, struct ocfs2_dinode *fe,
(unsigned long long)OCFS2_I(inode)->ip_blkno, (unsigned long long)OCFS2_I(inode)->ip_blkno,
(unsigned long long)le64_to_cpu(fe->i_blkno)); (unsigned long long)le64_to_cpu(fe->i_blkno));
inode->i_nlink = ocfs2_read_links_count(fe); set_nlink(inode, ocfs2_read_links_count(fe));
trace_ocfs2_populate_inode(OCFS2_I(inode)->ip_blkno, trace_ocfs2_populate_inode(OCFS2_I(inode)->ip_blkno,
le32_to_cpu(fe->i_flags)); le32_to_cpu(fe->i_flags));
@ -1290,7 +1290,7 @@ void ocfs2_refresh_inode(struct inode *inode,
OCFS2_I(inode)->ip_dyn_features = le16_to_cpu(fe->i_dyn_features); OCFS2_I(inode)->ip_dyn_features = le16_to_cpu(fe->i_dyn_features);
ocfs2_set_inode_flags(inode); ocfs2_set_inode_flags(inode);
i_size_write(inode, le64_to_cpu(fe->i_size)); i_size_write(inode, le64_to_cpu(fe->i_size));
inode->i_nlink = ocfs2_read_links_count(fe); set_nlink(inode, ocfs2_read_links_count(fe));
inode->i_uid = le32_to_cpu(fe->i_uid); inode->i_uid = le32_to_cpu(fe->i_uid);
inode->i_gid = le32_to_cpu(fe->i_gid); inode->i_gid = le32_to_cpu(fe->i_gid);
inode->i_mode = le16_to_cpu(fe->i_mode); inode->i_mode = le16_to_cpu(fe->i_mode);

18
fs/ocfs2/namei.c
View File

@ -199,9 +199,7 @@ static struct inode *ocfs2_get_init_inode(struct inode *dir, int mode)
* these are used by the support functions here and in * these are used by the support functions here and in
* callers. */ * callers. */
if (S_ISDIR(mode)) if (S_ISDIR(mode))
inode->i_nlink = 2; set_nlink(inode, 2);
else
inode->i_nlink = 1;
inode_init_owner(inode, dir, mode); inode_init_owner(inode, dir, mode);
dquot_initialize(inode); dquot_initialize(inode);
return inode; return inode;
@ -1379,7 +1377,7 @@ static int ocfs2_rename(struct inode *old_dir,
} }
if (new_inode) { if (new_inode) {
new_inode->i_nlink--; drop_nlink(new_inode);
new_inode->i_ctime = CURRENT_TIME; new_inode->i_ctime = CURRENT_TIME;
} }
old_dir->i_ctime = old_dir->i_mtime = CURRENT_TIME; old_dir->i_ctime = old_dir->i_mtime = CURRENT_TIME;
@ -1387,9 +1385,9 @@ static int ocfs2_rename(struct inode *old_dir,
if (update_dot_dot) { if (update_dot_dot) {
status = ocfs2_update_entry(old_inode, handle, status = ocfs2_update_entry(old_inode, handle,
&old_inode_dot_dot_res, new_dir); &old_inode_dot_dot_res, new_dir);
old_dir->i_nlink--; drop_nlink(old_dir);
if (new_inode) { if (new_inode) {
new_inode->i_nlink--; drop_nlink(new_inode);
} else { } else {
inc_nlink(new_dir); inc_nlink(new_dir);
mark_inode_dirty(new_dir); mark_inode_dirty(new_dir);
@ -2018,7 +2016,7 @@ static int ocfs2_orphan_add(struct ocfs2_super *osb,
orphan_fe = (struct ocfs2_dinode *) orphan_dir_bh->b_data; orphan_fe = (struct ocfs2_dinode *) orphan_dir_bh->b_data;
if (S_ISDIR(inode->i_mode)) if (S_ISDIR(inode->i_mode))
ocfs2_add_links_count(orphan_fe, 1); ocfs2_add_links_count(orphan_fe, 1);
orphan_dir_inode->i_nlink = ocfs2_read_links_count(orphan_fe); set_nlink(orphan_dir_inode, ocfs2_read_links_count(orphan_fe));
ocfs2_journal_dirty(handle, orphan_dir_bh); ocfs2_journal_dirty(handle, orphan_dir_bh);
status = __ocfs2_add_entry(handle, orphan_dir_inode, name, status = __ocfs2_add_entry(handle, orphan_dir_inode, name,
@ -2116,7 +2114,7 @@ int ocfs2_orphan_del(struct ocfs2_super *osb,
orphan_fe = (struct ocfs2_dinode *) orphan_dir_bh->b_data; orphan_fe = (struct ocfs2_dinode *) orphan_dir_bh->b_data;
if (S_ISDIR(inode->i_mode)) if (S_ISDIR(inode->i_mode))
ocfs2_add_links_count(orphan_fe, -1); ocfs2_add_links_count(orphan_fe, -1);
orphan_dir_inode->i_nlink = ocfs2_read_links_count(orphan_fe); set_nlink(orphan_dir_inode, ocfs2_read_links_count(orphan_fe));
ocfs2_journal_dirty(handle, orphan_dir_bh); ocfs2_journal_dirty(handle, orphan_dir_bh);
leave: leave:
@ -2282,7 +2280,7 @@ int ocfs2_create_inode_in_orphan(struct inode *dir,
goto leave; goto leave;
} }
inode->i_nlink = 0; clear_nlink(inode);
/* do the real work now. */ /* do the real work now. */
status = __ocfs2_mknod_locked(dir, inode, status = __ocfs2_mknod_locked(dir, inode,
0, &new_di_bh, parent_di_bh, handle, 0, &new_di_bh, parent_di_bh, handle,
@ -2437,7 +2435,7 @@ int ocfs2_mv_orphaned_inode_to_new(struct inode *dir,
di = (struct ocfs2_dinode *)di_bh->b_data; di = (struct ocfs2_dinode *)di_bh->b_data;
le32_add_cpu(&di->i_flags, -OCFS2_ORPHANED_FL); le32_add_cpu(&di->i_flags, -OCFS2_ORPHANED_FL);
di->i_orphaned_slot = 0; di->i_orphaned_slot = 0;
inode->i_nlink = 1; set_nlink(inode, 1);
ocfs2_set_links_count(di, inode->i_nlink); ocfs2_set_links_count(di, inode->i_nlink);
ocfs2_journal_dirty(handle, di_bh); ocfs2_journal_dirty(handle, di_bh);

4
fs/openpromfs/inode.c
View File

@ -242,7 +242,7 @@ static struct dentry *openpromfs_lookup(struct inode *dir, struct dentry *dentry
inode->i_mode = S_IFDIR | S_IRUGO | S_IXUGO; inode->i_mode = S_IFDIR | S_IRUGO | S_IXUGO;
inode->i_op = &openprom_inode_operations; inode->i_op = &openprom_inode_operations;
inode->i_fop = &openprom_operations; inode->i_fop = &openprom_operations;
inode->i_nlink = 2; set_nlink(inode, 2);
break; break;
case op_inode_prop: case op_inode_prop:
if (!strcmp(dp->name, "options") && (len == 17) && if (!strcmp(dp->name, "options") && (len == 17) &&
@ -251,7 +251,7 @@ static struct dentry *openpromfs_lookup(struct inode *dir, struct dentry *dentry
else else
inode->i_mode = S_IFREG | S_IRUGO; inode->i_mode = S_IFREG | S_IRUGO;
inode->i_fop = &openpromfs_prop_ops; inode->i_fop = &openpromfs_prop_ops;
inode->i_nlink = 1; set_nlink(inode, 1);
inode->i_size = ent_oi->u.prop->length; inode->i_size = ent_oi->u.prop->length;
break; break;
} }

12
fs/proc/base.c
View File

@ -2248,7 +2248,7 @@ static struct dentry *proc_pident_instantiate(struct inode *dir,
ei = PROC_I(inode); ei = PROC_I(inode);
inode->i_mode = p->mode; inode->i_mode = p->mode;
if (S_ISDIR(inode->i_mode)) if (S_ISDIR(inode->i_mode))
inode->i_nlink = 2; /* Use getattr to fix if necessary */ set_nlink(inode, 2); /* Use getattr to fix if necessary */
if (p->iop) if (p->iop)
inode->i_op = p->iop; inode->i_op = p->iop;
if (p->fop) if (p->fop)
@ -2642,7 +2642,7 @@ static struct dentry *proc_base_instantiate(struct inode *dir,
inode->i_mode = p->mode; inode->i_mode = p->mode;
if (S_ISDIR(inode->i_mode)) if (S_ISDIR(inode->i_mode))
inode->i_nlink = 2; set_nlink(inode, 2);
if (S_ISLNK(inode->i_mode)) if (S_ISLNK(inode->i_mode))
inode->i_size = 64; inode->i_size = 64;
if (p->iop) if (p->iop)
@ -2981,8 +2981,8 @@ static struct dentry *proc_pid_instantiate(struct inode *dir,
inode->i_fop = &proc_tgid_base_operations; inode->i_fop = &proc_tgid_base_operations;
inode->i_flags|=S_IMMUTABLE; inode->i_flags|=S_IMMUTABLE;
inode->i_nlink = 2 + pid_entry_count_dirs(tgid_base_stuff, set_nlink(inode, 2 + pid_entry_count_dirs(tgid_base_stuff,
ARRAY_SIZE(tgid_base_stuff)); ARRAY_SIZE(tgid_base_stuff)));
d_set_d_op(dentry, &pid_dentry_operations); d_set_d_op(dentry, &pid_dentry_operations);
@ -3233,8 +3233,8 @@ static struct dentry *proc_task_instantiate(struct inode *dir,
inode->i_fop = &proc_tid_base_operations; inode->i_fop = &proc_tid_base_operations;
inode->i_flags|=S_IMMUTABLE; inode->i_flags|=S_IMMUTABLE;
inode->i_nlink = 2 + pid_entry_count_dirs(tid_base_stuff, set_nlink(inode, 2 + pid_entry_count_dirs(tid_base_stuff,
ARRAY_SIZE(tid_base_stuff)); ARRAY_SIZE(tid_base_stuff)));
d_set_d_op(dentry, &pid_dentry_operations); d_set_d_op(dentry, &pid_dentry_operations);

2
fs/proc/generic.c
View File

@ -283,7 +283,7 @@ static int proc_getattr(struct vfsmount *mnt, struct dentry *dentry,
struct inode *inode = dentry->d_inode; struct inode *inode = dentry->d_inode;
struct proc_dir_entry *de = PROC_I(inode)->pde; struct proc_dir_entry *de = PROC_I(inode)->pde;
if (de && de->nlink) if (de && de->nlink)
inode->i_nlink = de->nlink; set_nlink(inode, de->nlink);
generic_fillattr(inode, stat); generic_fillattr(inode, stat);
return 0; return 0;

2
fs/proc/inode.c
View File

@ -445,7 +445,7 @@ struct inode *proc_get_inode(struct super_block *sb, struct proc_dir_entry *de)
if (de->size) if (de->size)
inode->i_size = de->size; inode->i_size = de->size;
if (de->nlink) if (de->nlink)
inode->i_nlink = de->nlink; set_nlink(inode, de->nlink);
if (de->proc_iops) if (de->proc_iops)
inode->i_op = de->proc_iops; inode->i_op = de->proc_iops;
if (de->proc_fops) { if (de->proc_fops) {

2
fs/proc/proc_sysctl.c
View File

@ -39,7 +39,7 @@ static struct inode *proc_sys_make_inode(struct super_block *sb,
inode->i_fop = &proc_sys_file_operations; inode->i_fop = &proc_sys_file_operations;
} else { } else {
inode->i_mode |= S_IFDIR; inode->i_mode |= S_IFDIR;
inode->i_nlink = 0; clear_nlink(inode);
inode->i_op = &proc_sys_dir_operations; inode->i_op = &proc_sys_dir_operations;
inode->i_fop = &proc_sys_dir_file_operations; inode->i_fop = &proc_sys_dir_file_operations;
} }

2
fs/qnx4/inode.c
View File

@ -379,7 +379,7 @@ struct inode *qnx4_iget(struct super_block *sb, unsigned long ino)
inode->i_mode = le16_to_cpu(raw_inode->di_mode); inode->i_mode = le16_to_cpu(raw_inode->di_mode);
inode->i_uid = (uid_t)le16_to_cpu(raw_inode->di_uid); inode->i_uid = (uid_t)le16_to_cpu(raw_inode->di_uid);
inode->i_gid = (gid_t)le16_to_cpu(raw_inode->di_gid); inode->i_gid = (gid_t)le16_to_cpu(raw_inode->di_gid);
inode->i_nlink = le16_to_cpu(raw_inode->di_nlink); set_nlink(inode, le16_to_cpu(raw_inode->di_nlink));
inode->i_size = le32_to_cpu(raw_inode->di_size); inode->i_size = le32_to_cpu(raw_inode->di_size);
inode->i_mtime.tv_sec = le32_to_cpu(raw_inode->di_mtime); inode->i_mtime.tv_sec = le32_to_cpu(raw_inode->di_mtime);
inode->i_mtime.tv_nsec = 0; inode->i_mtime.tv_nsec = 0;

10
fs/reiserfs/inode.c
View File

@ -1154,7 +1154,7 @@ static void init_inode(struct inode *inode, struct treepath *path)
set_inode_item_key_version(inode, KEY_FORMAT_3_5); set_inode_item_key_version(inode, KEY_FORMAT_3_5);
set_inode_sd_version(inode, STAT_DATA_V1); set_inode_sd_version(inode, STAT_DATA_V1);
inode->i_mode = sd_v1_mode(sd); inode->i_mode = sd_v1_mode(sd);
inode->i_nlink = sd_v1_nlink(sd); set_nlink(inode, sd_v1_nlink(sd));
inode->i_uid = sd_v1_uid(sd); inode->i_uid = sd_v1_uid(sd);
inode->i_gid = sd_v1_gid(sd); inode->i_gid = sd_v1_gid(sd);
inode->i_size = sd_v1_size(sd); inode->i_size = sd_v1_size(sd);
@ -1199,7 +1199,7 @@ static void init_inode(struct inode *inode, struct treepath *path)
struct stat_data *sd = (struct stat_data *)B_I_PITEM(bh, ih); struct stat_data *sd = (struct stat_data *)B_I_PITEM(bh, ih);
inode->i_mode = sd_v2_mode(sd); inode->i_mode = sd_v2_mode(sd);
inode->i_nlink = sd_v2_nlink(sd); set_nlink(inode, sd_v2_nlink(sd));
inode->i_uid = sd_v2_uid(sd); inode->i_uid = sd_v2_uid(sd);
inode->i_size = sd_v2_size(sd); inode->i_size = sd_v2_size(sd);
inode->i_gid = sd_v2_gid(sd); inode->i_gid = sd_v2_gid(sd);
@ -1444,7 +1444,7 @@ void reiserfs_read_locked_inode(struct inode *inode,
/* a stale NFS handle can trigger this without it being an error */ /* a stale NFS handle can trigger this without it being an error */
pathrelse(&path_to_sd); pathrelse(&path_to_sd);
reiserfs_make_bad_inode(inode); reiserfs_make_bad_inode(inode);
inode->i_nlink = 0; clear_nlink(inode);
return; return;
} }
@ -1832,7 +1832,7 @@ int reiserfs_new_inode(struct reiserfs_transaction_handle *th,
#endif #endif
/* fill stat data */ /* fill stat data */
inode->i_nlink = (S_ISDIR(mode) ? 2 : 1); set_nlink(inode, (S_ISDIR(mode) ? 2 : 1));
/* uid and gid must already be set by the caller for quota init */ /* uid and gid must already be set by the caller for quota init */
@ -1987,7 +1987,7 @@ int reiserfs_new_inode(struct reiserfs_transaction_handle *th,
make_bad_inode(inode); make_bad_inode(inode);
out_inserted_sd: out_inserted_sd:
inode->i_nlink = 0; clear_nlink(inode);
th->t_trans_id = 0; /* so the caller can't use this handle later */ th->t_trans_id = 0; /* so the caller can't use this handle later */
unlock_new_inode(inode); /* OK to do even if we hadn't locked it */ unlock_new_inode(inode); /* OK to do even if we hadn't locked it */
iput(inode); iput(inode);

16
fs/reiserfs/namei.c
View File

@ -19,7 +19,7 @@
#include <linux/reiserfs_xattr.h> #include <linux/reiserfs_xattr.h>
#include <linux/quotaops.h> #include <linux/quotaops.h>
#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; } #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); }
#define DEC_DIR_INODE_NLINK(i) if (i->i_nlink != 1) drop_nlink(i); #define DEC_DIR_INODE_NLINK(i) if (i->i_nlink != 1) drop_nlink(i);
// directory item contains array of entry headers. This performs // directory item contains array of entry headers. This performs
@ -622,7 +622,7 @@ static int reiserfs_create(struct inode *dir, struct dentry *dentry, int mode,
dentry->d_name.len, inode, 1 /*visible */ ); dentry->d_name.len, inode, 1 /*visible */ );
if (retval) { if (retval) {
int err; int err;
inode->i_nlink--; drop_nlink(inode);
reiserfs_update_sd(&th, inode); reiserfs_update_sd(&th, inode);
err = journal_end(&th, dir->i_sb, jbegin_count); err = journal_end(&th, dir->i_sb, jbegin_count);
if (err) if (err)
@ -702,7 +702,7 @@ static int reiserfs_mknod(struct inode *dir, struct dentry *dentry, int mode,
dentry->d_name.len, inode, 1 /*visible */ ); dentry->d_name.len, inode, 1 /*visible */ );
if (retval) { if (retval) {
int err; int err;
inode->i_nlink--; drop_nlink(inode);
reiserfs_update_sd(&th, inode); reiserfs_update_sd(&th, inode);
err = journal_end(&th, dir->i_sb, jbegin_count); err = journal_end(&th, dir->i_sb, jbegin_count);
if (err) if (err)
@ -787,7 +787,7 @@ static int reiserfs_mkdir(struct inode *dir, struct dentry *dentry, int mode)
dentry->d_name.len, inode, 1 /*visible */ ); dentry->d_name.len, inode, 1 /*visible */ );
if (retval) { if (retval) {
int err; int err;
inode->i_nlink = 0; clear_nlink(inode);
DEC_DIR_INODE_NLINK(dir); DEC_DIR_INODE_NLINK(dir);
reiserfs_update_sd(&th, inode); reiserfs_update_sd(&th, inode);
err = journal_end(&th, dir->i_sb, jbegin_count); err = journal_end(&th, dir->i_sb, jbegin_count);
@ -964,7 +964,7 @@ static int reiserfs_unlink(struct inode *dir, struct dentry *dentry)
reiserfs_warning(inode->i_sb, "reiserfs-7042", reiserfs_warning(inode->i_sb, "reiserfs-7042",
"deleting nonexistent file (%lu), %d", "deleting nonexistent file (%lu), %d",
inode->i_ino, inode->i_nlink); inode->i_ino, inode->i_nlink);
inode->i_nlink = 1; set_nlink(inode, 1);
} }
drop_nlink(inode); drop_nlink(inode);
@ -1086,7 +1086,7 @@ static int reiserfs_symlink(struct inode *parent_dir,
dentry->d_name.len, inode, 1 /*visible */ ); dentry->d_name.len, inode, 1 /*visible */ );
if (retval) { if (retval) {
int err; int err;
inode->i_nlink--; drop_nlink(inode);
reiserfs_update_sd(&th, inode); reiserfs_update_sd(&th, inode);
err = journal_end(&th, parent_dir->i_sb, jbegin_count); err = journal_end(&th, parent_dir->i_sb, jbegin_count);
if (err) if (err)
@ -1129,7 +1129,7 @@ static int reiserfs_link(struct dentry *old_dentry, struct inode *dir,
retval = journal_begin(&th, dir->i_sb, jbegin_count); retval = journal_begin(&th, dir->i_sb, jbegin_count);
if (retval) { if (retval) {
inode->i_nlink--; drop_nlink(inode);
reiserfs_write_unlock(dir->i_sb); reiserfs_write_unlock(dir->i_sb);
return retval; return retval;
} }
@ -1144,7 +1144,7 @@ static int reiserfs_link(struct dentry *old_dentry, struct inode *dir,
if (retval) { if (retval) {
int err; int err;
inode->i_nlink--; drop_nlink(inode);
err = journal_end(&th, dir->i_sb, jbegin_count); err = journal_end(&th, dir->i_sb, jbegin_count);
reiserfs_write_unlock(dir->i_sb); reiserfs_write_unlock(dir->i_sb);
return err ? err : retval; return err ? err : retval;

2
fs/romfs/super.c
View File

@ -337,7 +337,7 @@ static struct inode *romfs_iget(struct super_block *sb, unsigned long pos)
inode->i_metasize = (ROMFH_SIZE + nlen + 1 + ROMFH_PAD) & ROMFH_MASK; inode->i_metasize = (ROMFH_SIZE + nlen + 1 + ROMFH_PAD) & ROMFH_MASK;
inode->i_dataoffset = pos + inode->i_metasize; inode->i_dataoffset = pos + inode->i_metasize;
i->i_nlink = 1; /* Hard to decide.. */ set_nlink(i, 1); /* Hard to decide.. */
i->i_size = be32_to_cpu(ri.size); i->i_size = be32_to_cpu(ri.size);
i->i_mtime.tv_sec = i->i_atime.tv_sec = i->i_ctime.tv_sec = 0; i->i_mtime.tv_sec = i->i_atime.tv_sec = i->i_ctime.tv_sec = 0;
i->i_mtime.tv_nsec = i->i_atime.tv_nsec = i->i_ctime.tv_nsec = 0; i->i_mtime.tv_nsec = i->i_atime.tv_nsec = i->i_ctime.tv_nsec = 0;

18
fs/squashfs/inode.c
View File

@ -159,7 +159,7 @@ int squashfs_read_inode(struct inode *inode, long long ino)
frag_offset = 0; frag_offset = 0;
} }
inode->i_nlink = 1; set_nlink(inode, 1);
inode->i_size = le32_to_cpu(sqsh_ino->file_size); inode->i_size = le32_to_cpu(sqsh_ino->file_size);
inode->i_fop = &generic_ro_fops; inode->i_fop = &generic_ro_fops;
inode->i_mode |= S_IFREG; inode->i_mode |= S_IFREG;
@ -203,7 +203,7 @@ int squashfs_read_inode(struct inode *inode, long long ino)
} }
xattr_id = le32_to_cpu(sqsh_ino->xattr); xattr_id = le32_to_cpu(sqsh_ino->xattr);
inode->i_nlink = le32_to_cpu(sqsh_ino->nlink); set_nlink(inode, le32_to_cpu(sqsh_ino->nlink));
inode->i_size = le64_to_cpu(sqsh_ino->file_size); inode->i_size = le64_to_cpu(sqsh_ino->file_size);
inode->i_op = &squashfs_inode_ops; inode->i_op = &squashfs_inode_ops;
inode->i_fop = &generic_ro_fops; inode->i_fop = &generic_ro_fops;
@ -232,7 +232,7 @@ int squashfs_read_inode(struct inode *inode, long long ino)
if (err < 0) if (err < 0)
goto failed_read; goto failed_read;
inode->i_nlink = le32_to_cpu(sqsh_ino->nlink); set_nlink(inode, le32_to_cpu(sqsh_ino->nlink));
inode->i_size = le16_to_cpu(sqsh_ino->file_size); inode->i_size = le16_to_cpu(sqsh_ino->file_size);
inode->i_op = &squashfs_dir_inode_ops; inode->i_op = &squashfs_dir_inode_ops;
inode->i_fop = &squashfs_dir_ops; inode->i_fop = &squashfs_dir_ops;
@ -257,7 +257,7 @@ int squashfs_read_inode(struct inode *inode, long long ino)
goto failed_read; goto failed_read;
xattr_id = le32_to_cpu(sqsh_ino->xattr); xattr_id = le32_to_cpu(sqsh_ino->xattr);
inode->i_nlink = le32_to_cpu(sqsh_ino->nlink); set_nlink(inode, le32_to_cpu(sqsh_ino->nlink));
inode->i_size = le32_to_cpu(sqsh_ino->file_size); inode->i_size = le32_to_cpu(sqsh_ino->file_size);
inode->i_op = &squashfs_dir_inode_ops; inode->i_op = &squashfs_dir_inode_ops;
inode->i_fop = &squashfs_dir_ops; inode->i_fop = &squashfs_dir_ops;
@ -284,7 +284,7 @@ int squashfs_read_inode(struct inode *inode, long long ino)
if (err < 0) if (err < 0)
goto failed_read; goto failed_read;
inode->i_nlink = le32_to_cpu(sqsh_ino->nlink); set_nlink(inode, le32_to_cpu(sqsh_ino->nlink));
inode->i_size = le32_to_cpu(sqsh_ino->symlink_size); inode->i_size = le32_to_cpu(sqsh_ino->symlink_size);
inode->i_op = &squashfs_symlink_inode_ops; inode->i_op = &squashfs_symlink_inode_ops;
inode->i_data.a_ops = &squashfs_symlink_aops; inode->i_data.a_ops = &squashfs_symlink_aops;
@ -325,7 +325,7 @@ int squashfs_read_inode(struct inode *inode, long long ino)
inode->i_mode |= S_IFCHR; inode->i_mode |= S_IFCHR;
else else
inode->i_mode |= S_IFBLK; inode->i_mode |= S_IFBLK;
inode->i_nlink = le32_to_cpu(sqsh_ino->nlink); set_nlink(inode, le32_to_cpu(sqsh_ino->nlink));
rdev = le32_to_cpu(sqsh_ino->rdev); rdev = le32_to_cpu(sqsh_ino->rdev);
init_special_inode(inode, inode->i_mode, new_decode_dev(rdev)); init_special_inode(inode, inode->i_mode, new_decode_dev(rdev));
@ -349,7 +349,7 @@ int squashfs_read_inode(struct inode *inode, long long ino)
inode->i_mode |= S_IFBLK; inode->i_mode |= S_IFBLK;
xattr_id = le32_to_cpu(sqsh_ino->xattr); xattr_id = le32_to_cpu(sqsh_ino->xattr);
inode->i_op = &squashfs_inode_ops; inode->i_op = &squashfs_inode_ops;
inode->i_nlink = le32_to_cpu(sqsh_ino->nlink); set_nlink(inode, le32_to_cpu(sqsh_ino->nlink));
rdev = le32_to_cpu(sqsh_ino->rdev); rdev = le32_to_cpu(sqsh_ino->rdev);
init_special_inode(inode, inode->i_mode, new_decode_dev(rdev)); init_special_inode(inode, inode->i_mode, new_decode_dev(rdev));
@ -370,7 +370,7 @@ int squashfs_read_inode(struct inode *inode, long long ino)
inode->i_mode |= S_IFIFO; inode->i_mode |= S_IFIFO;
else else
inode->i_mode |= S_IFSOCK; inode->i_mode |= S_IFSOCK;
inode->i_nlink = le32_to_cpu(sqsh_ino->nlink); set_nlink(inode, le32_to_cpu(sqsh_ino->nlink));
init_special_inode(inode, inode->i_mode, 0); init_special_inode(inode, inode->i_mode, 0);
break; break;
} }
@ -389,7 +389,7 @@ int squashfs_read_inode(struct inode *inode, long long ino)
inode->i_mode |= S_IFSOCK; inode->i_mode |= S_IFSOCK;
xattr_id = le32_to_cpu(sqsh_ino->xattr); xattr_id = le32_to_cpu(sqsh_ino->xattr);
inode->i_op = &squashfs_inode_ops; inode->i_op = &squashfs_inode_ops;
inode->i_nlink = le32_to_cpu(sqsh_ino->nlink); set_nlink(inode, le32_to_cpu(sqsh_ino->nlink));
init_special_inode(inode, inode->i_mode, 0); init_special_inode(inode, inode->i_mode, 0);
break; break;
} }

2
fs/stack.c
View File

@ -71,6 +71,6 @@ void fsstack_copy_attr_all(struct inode *dest, const struct inode *src)
dest->i_ctime = src->i_ctime; dest->i_ctime = src->i_ctime;
dest->i_blkbits = src->i_blkbits; dest->i_blkbits = src->i_blkbits;
dest->i_flags = src->i_flags; dest->i_flags = src->i_flags;
dest->i_nlink = src->i_nlink; set_nlink(dest, src->i_nlink);
} }
EXPORT_SYMBOL_GPL(fsstack_copy_attr_all); EXPORT_SYMBOL_GPL(fsstack_copy_attr_all);

5
fs/stat.c
View File

@ -294,15 +294,16 @@ SYSCALL_DEFINE4(readlinkat, int, dfd, const char __user *, pathname,
{ {
struct path path; struct path path;
int error; int error;
int empty = 0;
if (bufsiz <= 0) if (bufsiz <= 0)
return -EINVAL; return -EINVAL;
error = user_path_at(dfd, pathname, LOOKUP_EMPTY, &path); error = user_path_at_empty(dfd, pathname, LOOKUP_EMPTY, &path, &empty);
if (!error) { if (!error) {
struct inode *inode = path.dentry->d_inode; struct inode *inode = path.dentry->d_inode;
error = -EINVAL; error = empty ? -ENOENT : -EINVAL;
if (inode->i_op->readlink) { if (inode->i_op->readlink) {
error = security_inode_readlink(path.dentry); error = security_inode_readlink(path.dentry);
if (!error) { if (!error) {

9
fs/super.c
View File

@ -727,8 +727,13 @@ int do_remount_sb(struct super_block *sb, int flags, void *data, int force)
if (sb->s_op->remount_fs) { if (sb->s_op->remount_fs) {
retval = sb->s_op->remount_fs(sb, &flags, data); retval = sb->s_op->remount_fs(sb, &flags, data);
if (retval) if (retval) {
return retval; if (!force)
return retval;
/* If forced remount, go ahead despite any errors */
WARN(1, "forced remount of a %s fs returned %i\n",
sb->s_type->name, retval);
}
} }
sb->s_flags = (sb->s_flags & ~MS_RMT_MASK) | (flags & MS_RMT_MASK); sb->s_flags = (sb->s_flags & ~MS_RMT_MASK) | (flags & MS_RMT_MASK);

2
fs/sysfs/inode.c
View File

@ -218,7 +218,7 @@ static void sysfs_refresh_inode(struct sysfs_dirent *sd, struct inode *inode)
} }
if (sysfs_type(sd) == SYSFS_DIR) if (sysfs_type(sd) == SYSFS_DIR)
inode->i_nlink = sd->s_dir.subdirs + 2; set_nlink(inode, sd->s_dir.subdirs + 2);
} }
int sysfs_getattr(struct vfsmount *mnt, struct dentry *dentry, struct kstat *stat) int sysfs_getattr(struct vfsmount *mnt, struct dentry *dentry, struct kstat *stat)

2
fs/sysv/inode.c
View File

@ -219,7 +219,7 @@ struct inode *sysv_iget(struct super_block *sb, unsigned int ino)
inode->i_mode = fs16_to_cpu(sbi, raw_inode->i_mode); inode->i_mode = fs16_to_cpu(sbi, raw_inode->i_mode);
inode->i_uid = (uid_t)fs16_to_cpu(sbi, raw_inode->i_uid); inode->i_uid = (uid_t)fs16_to_cpu(sbi, raw_inode->i_uid);
inode->i_gid = (gid_t)fs16_to_cpu(sbi, raw_inode->i_gid); inode->i_gid = (gid_t)fs16_to_cpu(sbi, raw_inode->i_gid);
inode->i_nlink = fs16_to_cpu(sbi, raw_inode->i_nlink); set_nlink(inode, fs16_to_cpu(sbi, raw_inode->i_nlink));
inode->i_size = fs32_to_cpu(sbi, raw_inode->i_size); inode->i_size = fs32_to_cpu(sbi, raw_inode->i_size);
inode->i_atime.tv_sec = fs32_to_cpu(sbi, raw_inode->i_atime); inode->i_atime.tv_sec = fs32_to_cpu(sbi, raw_inode->i_atime);
inode->i_mtime.tv_sec = fs32_to_cpu(sbi, raw_inode->i_mtime); inode->i_mtime.tv_sec = fs32_to_cpu(sbi, raw_inode->i_mtime);

2
fs/ubifs/super.c
View File

@ -129,7 +129,7 @@ struct inode *ubifs_iget(struct super_block *sb, unsigned long inum)
goto out_ino; goto out_ino;
inode->i_flags |= (S_NOCMTIME | S_NOATIME); inode->i_flags |= (S_NOCMTIME | S_NOATIME);
inode->i_nlink = le32_to_cpu(ino->nlink); set_nlink(inode, le32_to_cpu(ino->nlink));
inode->i_uid = le32_to_cpu(ino->uid); inode->i_uid = le32_to_cpu(ino->uid);
inode->i_gid = le32_to_cpu(ino->gid); inode->i_gid = le32_to_cpu(ino->gid);
inode->i_atime.tv_sec = (int64_t)le64_to_cpu(ino->atime_sec); inode->i_atime.tv_sec = (int64_t)le64_to_cpu(ino->atime_sec);

4
fs/ubifs/xattr.c
View File

@ -558,10 +558,10 @@ int ubifs_removexattr(struct dentry *dentry, const char *name)
} }
ubifs_assert(inode->i_nlink == 1); ubifs_assert(inode->i_nlink == 1);
inode->i_nlink = 0; clear_nlink(inode);
err = remove_xattr(c, host, inode, &nm); err = remove_xattr(c, host, inode, &nm);
if (err) if (err)
inode->i_nlink = 1; set_nlink(inode, 1);
/* If @i_nlink is 0, 'iput()' will delete the inode */ /* If @i_nlink is 0, 'iput()' will delete the inode */
iput(inode); iput(inode);

8
fs/udf/inode.c
View File

@ -1241,6 +1241,7 @@ static void udf_fill_inode(struct inode *inode, struct buffer_head *bh)
int offset; int offset;
struct udf_sb_info *sbi = UDF_SB(inode->i_sb); struct udf_sb_info *sbi = UDF_SB(inode->i_sb);
struct udf_inode_info *iinfo = UDF_I(inode); struct udf_inode_info *iinfo = UDF_I(inode);
unsigned int link_count;
fe = (struct fileEntry *)bh->b_data; fe = (struct fileEntry *)bh->b_data;
efe = (struct extendedFileEntry *)bh->b_data; efe = (struct extendedFileEntry *)bh->b_data;
@ -1323,9 +1324,10 @@ static void udf_fill_inode(struct inode *inode, struct buffer_head *bh)
inode->i_mode &= ~sbi->s_umask; inode->i_mode &= ~sbi->s_umask;
read_unlock(&sbi->s_cred_lock); read_unlock(&sbi->s_cred_lock);
inode->i_nlink = le16_to_cpu(fe->fileLinkCount); link_count = le16_to_cpu(fe->fileLinkCount);
if (!inode->i_nlink) if (!link_count)
inode->i_nlink = 1; link_count = 1;
set_nlink(inode, link_count);
inode->i_size = le64_to_cpu(fe->informationLength); inode->i_size = le64_to_cpu(fe->informationLength);
iinfo->i_lenExtents = inode->i_size; iinfo->i_lenExtents = inode->i_size;

Some files were not shown because too many files have changed in this diff Show More