diff options
Diffstat (limited to 'fs/ext3/namei.c')
-rw-r--r-- | fs/ext3/namei.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/fs/ext3/namei.c b/fs/ext3/namei.c index a492b371b134..ee184084ca42 100644 --- a/fs/ext3/namei.c +++ b/fs/ext3/namei.c | |||
@@ -1696,7 +1696,7 @@ static int ext3_create (struct inode * dir, struct dentry * dentry, int mode, | |||
1696 | struct inode * inode; | 1696 | struct inode * inode; |
1697 | int err, retries = 0; | 1697 | int err, retries = 0; |
1698 | 1698 | ||
1699 | vfs_dq_init(dir); | 1699 | dquot_initialize(dir); |
1700 | 1700 | ||
1701 | retry: | 1701 | retry: |
1702 | handle = ext3_journal_start(dir, EXT3_DATA_TRANS_BLOCKS(dir->i_sb) + | 1702 | handle = ext3_journal_start(dir, EXT3_DATA_TRANS_BLOCKS(dir->i_sb) + |
@@ -1732,7 +1732,7 @@ static int ext3_mknod (struct inode * dir, struct dentry *dentry, | |||
1732 | if (!new_valid_dev(rdev)) | 1732 | if (!new_valid_dev(rdev)) |
1733 | return -EINVAL; | 1733 | return -EINVAL; |
1734 | 1734 | ||
1735 | vfs_dq_init(dir); | 1735 | dquot_initialize(dir); |
1736 | 1736 | ||
1737 | retry: | 1737 | retry: |
1738 | handle = ext3_journal_start(dir, EXT3_DATA_TRANS_BLOCKS(dir->i_sb) + | 1738 | handle = ext3_journal_start(dir, EXT3_DATA_TRANS_BLOCKS(dir->i_sb) + |
@@ -1770,7 +1770,7 @@ static int ext3_mkdir(struct inode * dir, struct dentry * dentry, int mode) | |||
1770 | if (dir->i_nlink >= EXT3_LINK_MAX) | 1770 | if (dir->i_nlink >= EXT3_LINK_MAX) |
1771 | return -EMLINK; | 1771 | return -EMLINK; |
1772 | 1772 | ||
1773 | vfs_dq_init(dir); | 1773 | dquot_initialize(dir); |
1774 | 1774 | ||
1775 | retry: | 1775 | retry: |
1776 | handle = ext3_journal_start(dir, EXT3_DATA_TRANS_BLOCKS(dir->i_sb) + | 1776 | handle = ext3_journal_start(dir, EXT3_DATA_TRANS_BLOCKS(dir->i_sb) + |
@@ -2066,8 +2066,8 @@ static int ext3_rmdir (struct inode * dir, struct dentry *dentry) | |||
2066 | 2066 | ||
2067 | /* Initialize quotas before so that eventual writes go in | 2067 | /* Initialize quotas before so that eventual writes go in |
2068 | * separate transaction */ | 2068 | * separate transaction */ |
2069 | vfs_dq_init(dir); | 2069 | dquot_initialize(dir); |
2070 | vfs_dq_init(dentry->d_inode); | 2070 | dquot_initialize(dentry->d_inode); |
2071 | 2071 | ||
2072 | handle = ext3_journal_start(dir, EXT3_DELETE_TRANS_BLOCKS(dir->i_sb)); | 2072 | handle = ext3_journal_start(dir, EXT3_DELETE_TRANS_BLOCKS(dir->i_sb)); |
2073 | if (IS_ERR(handle)) | 2073 | if (IS_ERR(handle)) |
@@ -2127,8 +2127,8 @@ static int ext3_unlink(struct inode * dir, struct dentry *dentry) | |||
2127 | 2127 | ||
2128 | /* Initialize quotas before so that eventual writes go | 2128 | /* Initialize quotas before so that eventual writes go |
2129 | * in separate transaction */ | 2129 | * in separate transaction */ |
2130 | vfs_dq_init(dir); | 2130 | dquot_initialize(dir); |
2131 | vfs_dq_init(dentry->d_inode); | 2131 | dquot_initialize(dentry->d_inode); |
2132 | 2132 | ||
2133 | handle = ext3_journal_start(dir, EXT3_DELETE_TRANS_BLOCKS(dir->i_sb)); | 2133 | handle = ext3_journal_start(dir, EXT3_DELETE_TRANS_BLOCKS(dir->i_sb)); |
2134 | if (IS_ERR(handle)) | 2134 | if (IS_ERR(handle)) |
@@ -2184,7 +2184,7 @@ static int ext3_symlink (struct inode * dir, | |||
2184 | if (l > dir->i_sb->s_blocksize) | 2184 | if (l > dir->i_sb->s_blocksize) |
2185 | return -ENAMETOOLONG; | 2185 | return -ENAMETOOLONG; |
2186 | 2186 | ||
2187 | vfs_dq_init(dir); | 2187 | dquot_initialize(dir); |
2188 | 2188 | ||
2189 | retry: | 2189 | retry: |
2190 | handle = ext3_journal_start(dir, EXT3_DATA_TRANS_BLOCKS(dir->i_sb) + | 2190 | handle = ext3_journal_start(dir, EXT3_DATA_TRANS_BLOCKS(dir->i_sb) + |
@@ -2241,7 +2241,7 @@ static int ext3_link (struct dentry * old_dentry, | |||
2241 | if (inode->i_nlink >= EXT3_LINK_MAX) | 2241 | if (inode->i_nlink >= EXT3_LINK_MAX) |
2242 | return -EMLINK; | 2242 | return -EMLINK; |
2243 | 2243 | ||
2244 | vfs_dq_init(dir); | 2244 | dquot_initialize(dir); |
2245 | 2245 | ||
2246 | /* | 2246 | /* |
2247 | * Return -ENOENT if we've raced with unlink and i_nlink is 0. Doing | 2247 | * Return -ENOENT if we've raced with unlink and i_nlink is 0. Doing |
@@ -2293,15 +2293,15 @@ static int ext3_rename (struct inode * old_dir, struct dentry *old_dentry, | |||
2293 | struct ext3_dir_entry_2 * old_de, * new_de; | 2293 | struct ext3_dir_entry_2 * old_de, * new_de; |
2294 | int retval, flush_file = 0; | 2294 | int retval, flush_file = 0; |
2295 | 2295 | ||
2296 | vfs_dq_init(old_dir); | 2296 | dquot_initialize(old_dir); |
2297 | vfs_dq_init(new_dir); | 2297 | dquot_initialize(new_dir); |
2298 | 2298 | ||
2299 | old_bh = new_bh = dir_bh = NULL; | 2299 | old_bh = new_bh = dir_bh = NULL; |
2300 | 2300 | ||
2301 | /* Initialize quotas before so that eventual writes go | 2301 | /* Initialize quotas before so that eventual writes go |
2302 | * in separate transaction */ | 2302 | * in separate transaction */ |
2303 | if (new_dentry->d_inode) | 2303 | if (new_dentry->d_inode) |
2304 | vfs_dq_init(new_dentry->d_inode); | 2304 | dquot_initialize(new_dentry->d_inode); |
2305 | handle = ext3_journal_start(old_dir, 2 * | 2305 | handle = ext3_journal_start(old_dir, 2 * |
2306 | EXT3_DATA_TRANS_BLOCKS(old_dir->i_sb) + | 2306 | EXT3_DATA_TRANS_BLOCKS(old_dir->i_sb) + |
2307 | EXT3_INDEX_EXTRA_TRANS_BLOCKS + 2); | 2307 | EXT3_INDEX_EXTRA_TRANS_BLOCKS + 2); |