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/ext3 | |
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/ext3')
-rw-r--r-- | fs/ext3/inode.c | 2 | ||||
-rw-r--r-- | fs/ext3/namei.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/fs/ext3/inode.c b/fs/ext3/inode.c index 12661e1deedd..85fe655fe3e0 100644 --- a/fs/ext3/inode.c +++ b/fs/ext3/inode.c | |||
@@ -2899,7 +2899,7 @@ struct inode *ext3_iget(struct super_block *sb, unsigned long ino) | |||
2899 | inode->i_uid |= le16_to_cpu(raw_inode->i_uid_high) << 16; | 2899 | inode->i_uid |= le16_to_cpu(raw_inode->i_uid_high) << 16; |
2900 | inode->i_gid |= le16_to_cpu(raw_inode->i_gid_high) << 16; | 2900 | inode->i_gid |= le16_to_cpu(raw_inode->i_gid_high) << 16; |
2901 | } | 2901 | } |
2902 | inode->i_nlink = le16_to_cpu(raw_inode->i_links_count); | 2902 | set_nlink(inode, le16_to_cpu(raw_inode->i_links_count)); |
2903 | inode->i_size = le32_to_cpu(raw_inode->i_size); | 2903 | inode->i_size = le32_to_cpu(raw_inode->i_size); |
2904 | inode->i_atime.tv_sec = (signed)le32_to_cpu(raw_inode->i_atime); | 2904 | inode->i_atime.tv_sec = (signed)le32_to_cpu(raw_inode->i_atime); |
2905 | inode->i_ctime.tv_sec = (signed)le32_to_cpu(raw_inode->i_ctime); | 2905 | inode->i_ctime.tv_sec = (signed)le32_to_cpu(raw_inode->i_ctime); |
diff --git a/fs/ext3/namei.c b/fs/ext3/namei.c index 8a60e3327659..642dc6d66dfd 100644 --- a/fs/ext3/namei.c +++ b/fs/ext3/namei.c | |||
@@ -1821,7 +1821,7 @@ retry: | |||
1821 | de->name_len = 2; | 1821 | de->name_len = 2; |
1822 | strcpy (de->name, ".."); | 1822 | strcpy (de->name, ".."); |
1823 | ext3_set_de_type(dir->i_sb, de, S_IFDIR); | 1823 | ext3_set_de_type(dir->i_sb, de, S_IFDIR); |
1824 | inode->i_nlink = 2; | 1824 | set_nlink(inode, 2); |
1825 | BUFFER_TRACE(dir_block, "call ext3_journal_dirty_metadata"); | 1825 | BUFFER_TRACE(dir_block, "call ext3_journal_dirty_metadata"); |
1826 | err = ext3_journal_dirty_metadata(handle, dir_block); | 1826 | err = ext3_journal_dirty_metadata(handle, dir_block); |
1827 | if (err) | 1827 | if (err) |
@@ -2170,7 +2170,7 @@ static int ext3_unlink(struct inode * dir, struct dentry *dentry) | |||
2170 | ext3_warning (inode->i_sb, "ext3_unlink", | 2170 | ext3_warning (inode->i_sb, "ext3_unlink", |
2171 | "Deleting nonexistent file (%lu), %d", | 2171 | "Deleting nonexistent file (%lu), %d", |
2172 | inode->i_ino, inode->i_nlink); | 2172 | inode->i_ino, inode->i_nlink); |
2173 | inode->i_nlink = 1; | 2173 | set_nlink(inode, 1); |
2174 | } | 2174 | } |
2175 | retval = ext3_delete_entry(handle, dir, de, bh); | 2175 | retval = ext3_delete_entry(handle, dir, de, bh); |
2176 | if (retval) | 2176 | if (retval) |