diff options
author | Miklos Szeredi <mszeredi@suse.cz> | 2011-10-28 08:13:29 -0400 |
---|---|---|
committer | Christoph Hellwig <hch@serles.lst.de> | 2011-11-02 07:53:43 -0400 |
commit | bfe8684869601dacfcb2cd69ef8cfd9045f62170 (patch) | |
tree | 4e213aaa766b26f43f0f9ec7998a7745239d9377 /fs/btrfs | |
parent | 6d6b77f163c7eabedbba00ed2abb7d4a570bff76 (diff) |
filesystems: add set_nlink()
Replace remaining direct i_nlink updates with a new set_nlink()
updater function.
Signed-off-by: Miklos Szeredi <mszeredi@suse.cz>
Tested-by: Toshiyuki Okajima <toshi.okajima@jp.fujitsu.com>
Signed-off-by: Christoph Hellwig <hch@lst.de>
Diffstat (limited to 'fs/btrfs')
-rw-r--r-- | fs/btrfs/delayed-inode.c | 2 | ||||
-rw-r--r-- | fs/btrfs/disk-io.c | 2 | ||||
-rw-r--r-- | fs/btrfs/inode.c | 4 | ||||
-rw-r--r-- | fs/btrfs/tree-log.c | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/fs/btrfs/delayed-inode.c b/fs/btrfs/delayed-inode.c index b52c672f4c18..ae4d9cd10961 100644 --- a/fs/btrfs/delayed-inode.c +++ b/fs/btrfs/delayed-inode.c | |||
@@ -1641,7 +1641,7 @@ int btrfs_fill_inode(struct inode *inode, u32 *rdev) | |||
1641 | inode->i_gid = btrfs_stack_inode_gid(inode_item); | 1641 | inode->i_gid = btrfs_stack_inode_gid(inode_item); |
1642 | btrfs_i_size_write(inode, btrfs_stack_inode_size(inode_item)); | 1642 | btrfs_i_size_write(inode, btrfs_stack_inode_size(inode_item)); |
1643 | inode->i_mode = btrfs_stack_inode_mode(inode_item); | 1643 | inode->i_mode = btrfs_stack_inode_mode(inode_item); |
1644 | inode->i_nlink = btrfs_stack_inode_nlink(inode_item); | 1644 | set_nlink(inode, btrfs_stack_inode_nlink(inode_item)); |
1645 | inode_set_bytes(inode, btrfs_stack_inode_nbytes(inode_item)); | 1645 | inode_set_bytes(inode, btrfs_stack_inode_nbytes(inode_item)); |
1646 | BTRFS_I(inode)->generation = btrfs_stack_inode_generation(inode_item); | 1646 | BTRFS_I(inode)->generation = btrfs_stack_inode_generation(inode_item); |
1647 | BTRFS_I(inode)->sequence = btrfs_stack_inode_sequence(inode_item); | 1647 | BTRFS_I(inode)->sequence = btrfs_stack_inode_sequence(inode_item); |
diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c index 07b3ac662e19..07ea91879a91 100644 --- a/fs/btrfs/disk-io.c +++ b/fs/btrfs/disk-io.c | |||
@@ -1705,7 +1705,7 @@ struct btrfs_root *open_ctree(struct super_block *sb, | |||
1705 | sb->s_bdi = &fs_info->bdi; | 1705 | sb->s_bdi = &fs_info->bdi; |
1706 | 1706 | ||
1707 | fs_info->btree_inode->i_ino = BTRFS_BTREE_INODE_OBJECTID; | 1707 | fs_info->btree_inode->i_ino = BTRFS_BTREE_INODE_OBJECTID; |
1708 | fs_info->btree_inode->i_nlink = 1; | 1708 | set_nlink(fs_info->btree_inode, 1); |
1709 | /* | 1709 | /* |
1710 | * we set the i_size on the btree inode to the max possible int. | 1710 | * we set the i_size on the btree inode to the max possible int. |
1711 | * the real end of the address space is determined by all of | 1711 | * the real end of the address space is determined by all of |
diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c index b2d004ad66a0..75686a61bd45 100644 --- a/fs/btrfs/inode.c +++ b/fs/btrfs/inode.c | |||
@@ -2534,7 +2534,7 @@ static void btrfs_read_locked_inode(struct inode *inode) | |||
2534 | inode_item = btrfs_item_ptr(leaf, path->slots[0], | 2534 | inode_item = btrfs_item_ptr(leaf, path->slots[0], |
2535 | struct btrfs_inode_item); | 2535 | struct btrfs_inode_item); |
2536 | inode->i_mode = btrfs_inode_mode(leaf, inode_item); | 2536 | inode->i_mode = btrfs_inode_mode(leaf, inode_item); |
2537 | inode->i_nlink = btrfs_inode_nlink(leaf, inode_item); | 2537 | set_nlink(inode, btrfs_inode_nlink(leaf, inode_item)); |
2538 | inode->i_uid = btrfs_inode_uid(leaf, inode_item); | 2538 | inode->i_uid = btrfs_inode_uid(leaf, inode_item); |
2539 | inode->i_gid = btrfs_inode_gid(leaf, inode_item); | 2539 | inode->i_gid = btrfs_inode_gid(leaf, inode_item); |
2540 | btrfs_i_size_write(inode, btrfs_inode_size(leaf, inode_item)); | 2540 | 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, | |||
6728 | inode->i_op = &btrfs_dir_inode_operations; | 6728 | inode->i_op = &btrfs_dir_inode_operations; |
6729 | inode->i_fop = &btrfs_dir_file_operations; | 6729 | inode->i_fop = &btrfs_dir_file_operations; |
6730 | 6730 | ||
6731 | inode->i_nlink = 1; | 6731 | set_nlink(inode, 1); |
6732 | btrfs_i_size_write(inode, 0); | 6732 | btrfs_i_size_write(inode, 0); |
6733 | 6733 | ||
6734 | err = btrfs_update_inode(trans, new_root, inode); | 6734 | err = btrfs_update_inode(trans, new_root, inode); |
diff --git a/fs/btrfs/tree-log.c b/fs/btrfs/tree-log.c index 786639fca067..0618aa39740b 100644 --- a/fs/btrfs/tree-log.c +++ b/fs/btrfs/tree-log.c | |||
@@ -1030,7 +1030,7 @@ static noinline int fixup_inode_link_count(struct btrfs_trans_handle *trans, | |||
1030 | } | 1030 | } |
1031 | btrfs_release_path(path); | 1031 | btrfs_release_path(path); |
1032 | if (nlink != inode->i_nlink) { | 1032 | if (nlink != inode->i_nlink) { |
1033 | inode->i_nlink = nlink; | 1033 | set_nlink(inode, nlink); |
1034 | btrfs_update_inode(trans, root, inode); | 1034 | btrfs_update_inode(trans, root, inode); |
1035 | } | 1035 | } |
1036 | BTRFS_I(inode)->index_cnt = (u64)-1; | 1036 | BTRFS_I(inode)->index_cnt = (u64)-1; |