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/ext4/namei.c | |
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/ext4/namei.c')
-rw-r--r-- | fs/ext4/namei.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/ext4/namei.c b/fs/ext4/namei.c index 4623c082f3b2..5f7fb46293be 100644 --- a/fs/ext4/namei.c +++ b/fs/ext4/namei.c | |||
@@ -1694,7 +1694,7 @@ static void ext4_inc_count(handle_t *handle, struct inode *inode) | |||
1694 | if (is_dx(inode) && inode->i_nlink > 1) { | 1694 | if (is_dx(inode) && inode->i_nlink > 1) { |
1695 | /* limit is 16-bit i_links_count */ | 1695 | /* limit is 16-bit i_links_count */ |
1696 | if (inode->i_nlink >= EXT4_LINK_MAX || inode->i_nlink == 2) { | 1696 | if (inode->i_nlink >= EXT4_LINK_MAX || inode->i_nlink == 2) { |
1697 | inode->i_nlink = 1; | 1697 | set_nlink(inode, 1); |
1698 | EXT4_SET_RO_COMPAT_FEATURE(inode->i_sb, | 1698 | EXT4_SET_RO_COMPAT_FEATURE(inode->i_sb, |
1699 | EXT4_FEATURE_RO_COMPAT_DIR_NLINK); | 1699 | EXT4_FEATURE_RO_COMPAT_DIR_NLINK); |
1700 | } | 1700 | } |
@@ -1861,7 +1861,7 @@ retry: | |||
1861 | de->name_len = 2; | 1861 | de->name_len = 2; |
1862 | strcpy(de->name, ".."); | 1862 | strcpy(de->name, ".."); |
1863 | ext4_set_de_type(dir->i_sb, de, S_IFDIR); | 1863 | ext4_set_de_type(dir->i_sb, de, S_IFDIR); |
1864 | inode->i_nlink = 2; | 1864 | set_nlink(inode, 2); |
1865 | BUFFER_TRACE(dir_block, "call ext4_handle_dirty_metadata"); | 1865 | BUFFER_TRACE(dir_block, "call ext4_handle_dirty_metadata"); |
1866 | err = ext4_handle_dirty_metadata(handle, dir, dir_block); | 1866 | err = ext4_handle_dirty_metadata(handle, dir, dir_block); |
1867 | if (err) | 1867 | if (err) |
@@ -2214,7 +2214,7 @@ static int ext4_unlink(struct inode *dir, struct dentry *dentry) | |||
2214 | ext4_warning(inode->i_sb, | 2214 | ext4_warning(inode->i_sb, |
2215 | "Deleting nonexistent file (%lu), %d", | 2215 | "Deleting nonexistent file (%lu), %d", |
2216 | inode->i_ino, inode->i_nlink); | 2216 | inode->i_ino, inode->i_nlink); |
2217 | inode->i_nlink = 1; | 2217 | set_nlink(inode, 1); |
2218 | } | 2218 | } |
2219 | retval = ext4_delete_entry(handle, dir, de, bh); | 2219 | retval = ext4_delete_entry(handle, dir, de, bh); |
2220 | if (retval) | 2220 | if (retval) |