diff options
Diffstat (limited to 'fs/reiserfs/namei.c')
-rw-r--r-- | fs/reiserfs/namei.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/fs/reiserfs/namei.c b/fs/reiserfs/namei.c index c55e1b9fee5f..96e4cbbfaa18 100644 --- a/fs/reiserfs/namei.c +++ b/fs/reiserfs/namei.c | |||
@@ -554,7 +554,7 @@ static int drop_new_inode(struct inode *inode) | |||
554 | } | 554 | } |
555 | 555 | ||
556 | /* utility function that does setup for reiserfs_new_inode. | 556 | /* utility function that does setup for reiserfs_new_inode. |
557 | ** vfs_dq_init needs lots of credits so it's better to have it | 557 | ** dquot_initialize needs lots of credits so it's better to have it |
558 | ** outside of a transaction, so we had to pull some bits of | 558 | ** outside of a transaction, so we had to pull some bits of |
559 | ** reiserfs_new_inode out into this func. | 559 | ** reiserfs_new_inode out into this func. |
560 | */ | 560 | */ |
@@ -577,7 +577,7 @@ static int new_inode_init(struct inode *inode, struct inode *dir, int mode) | |||
577 | } else { | 577 | } else { |
578 | inode->i_gid = current_fsgid(); | 578 | inode->i_gid = current_fsgid(); |
579 | } | 579 | } |
580 | vfs_dq_init(inode); | 580 | dquot_initialize(inode); |
581 | return 0; | 581 | return 0; |
582 | } | 582 | } |
583 | 583 | ||
@@ -594,7 +594,7 @@ static int reiserfs_create(struct inode *dir, struct dentry *dentry, int mode, | |||
594 | struct reiserfs_transaction_handle th; | 594 | struct reiserfs_transaction_handle th; |
595 | struct reiserfs_security_handle security; | 595 | struct reiserfs_security_handle security; |
596 | 596 | ||
597 | vfs_dq_init(dir); | 597 | dquot_initialize(dir); |
598 | 598 | ||
599 | if (!(inode = new_inode(dir->i_sb))) { | 599 | if (!(inode = new_inode(dir->i_sb))) { |
600 | return -ENOMEM; | 600 | return -ENOMEM; |
@@ -668,7 +668,7 @@ static int reiserfs_mknod(struct inode *dir, struct dentry *dentry, int mode, | |||
668 | if (!new_valid_dev(rdev)) | 668 | if (!new_valid_dev(rdev)) |
669 | return -EINVAL; | 669 | return -EINVAL; |
670 | 670 | ||
671 | vfs_dq_init(dir); | 671 | dquot_initialize(dir); |
672 | 672 | ||
673 | if (!(inode = new_inode(dir->i_sb))) { | 673 | if (!(inode = new_inode(dir->i_sb))) { |
674 | return -ENOMEM; | 674 | return -ENOMEM; |
@@ -743,7 +743,7 @@ static int reiserfs_mkdir(struct inode *dir, struct dentry *dentry, int mode) | |||
743 | 2 * (REISERFS_QUOTA_INIT_BLOCKS(dir->i_sb) + | 743 | 2 * (REISERFS_QUOTA_INIT_BLOCKS(dir->i_sb) + |
744 | REISERFS_QUOTA_TRANS_BLOCKS(dir->i_sb)); | 744 | REISERFS_QUOTA_TRANS_BLOCKS(dir->i_sb)); |
745 | 745 | ||
746 | vfs_dq_init(dir); | 746 | dquot_initialize(dir); |
747 | 747 | ||
748 | #ifdef DISPLACE_NEW_PACKING_LOCALITIES | 748 | #ifdef DISPLACE_NEW_PACKING_LOCALITIES |
749 | /* set flag that new packing locality created and new blocks for the content * of that directory are not displaced yet */ | 749 | /* set flag that new packing locality created and new blocks for the content * of that directory are not displaced yet */ |
@@ -848,7 +848,7 @@ static int reiserfs_rmdir(struct inode *dir, struct dentry *dentry) | |||
848 | JOURNAL_PER_BALANCE_CNT * 2 + 2 + | 848 | JOURNAL_PER_BALANCE_CNT * 2 + 2 + |
849 | 4 * REISERFS_QUOTA_TRANS_BLOCKS(dir->i_sb); | 849 | 4 * REISERFS_QUOTA_TRANS_BLOCKS(dir->i_sb); |
850 | 850 | ||
851 | vfs_dq_init(dir); | 851 | dquot_initialize(dir); |
852 | 852 | ||
853 | reiserfs_write_lock(dir->i_sb); | 853 | reiserfs_write_lock(dir->i_sb); |
854 | retval = journal_begin(&th, dir->i_sb, jbegin_count); | 854 | retval = journal_begin(&th, dir->i_sb, jbegin_count); |
@@ -931,7 +931,7 @@ static int reiserfs_unlink(struct inode *dir, struct dentry *dentry) | |||
931 | unsigned long savelink; | 931 | unsigned long savelink; |
932 | int depth; | 932 | int depth; |
933 | 933 | ||
934 | vfs_dq_init(dir); | 934 | dquot_initialize(dir); |
935 | 935 | ||
936 | inode = dentry->d_inode; | 936 | inode = dentry->d_inode; |
937 | 937 | ||
@@ -1034,7 +1034,7 @@ static int reiserfs_symlink(struct inode *parent_dir, | |||
1034 | 2 * (REISERFS_QUOTA_INIT_BLOCKS(parent_dir->i_sb) + | 1034 | 2 * (REISERFS_QUOTA_INIT_BLOCKS(parent_dir->i_sb) + |
1035 | REISERFS_QUOTA_TRANS_BLOCKS(parent_dir->i_sb)); | 1035 | REISERFS_QUOTA_TRANS_BLOCKS(parent_dir->i_sb)); |
1036 | 1036 | ||
1037 | vfs_dq_init(parent_dir); | 1037 | dquot_initialize(parent_dir); |
1038 | 1038 | ||
1039 | if (!(inode = new_inode(parent_dir->i_sb))) { | 1039 | if (!(inode = new_inode(parent_dir->i_sb))) { |
1040 | return -ENOMEM; | 1040 | return -ENOMEM; |
@@ -1123,7 +1123,7 @@ static int reiserfs_link(struct dentry *old_dentry, struct inode *dir, | |||
1123 | JOURNAL_PER_BALANCE_CNT * 3 + | 1123 | JOURNAL_PER_BALANCE_CNT * 3 + |
1124 | 2 * REISERFS_QUOTA_TRANS_BLOCKS(dir->i_sb); | 1124 | 2 * REISERFS_QUOTA_TRANS_BLOCKS(dir->i_sb); |
1125 | 1125 | ||
1126 | vfs_dq_init(dir); | 1126 | dquot_initialize(dir); |
1127 | 1127 | ||
1128 | reiserfs_write_lock(dir->i_sb); | 1128 | reiserfs_write_lock(dir->i_sb); |
1129 | if (inode->i_nlink >= REISERFS_LINK_MAX) { | 1129 | if (inode->i_nlink >= REISERFS_LINK_MAX) { |
@@ -1249,8 +1249,8 @@ static int reiserfs_rename(struct inode *old_dir, struct dentry *old_dentry, | |||
1249 | JOURNAL_PER_BALANCE_CNT * 3 + 5 + | 1249 | JOURNAL_PER_BALANCE_CNT * 3 + 5 + |
1250 | 4 * REISERFS_QUOTA_TRANS_BLOCKS(old_dir->i_sb); | 1250 | 4 * REISERFS_QUOTA_TRANS_BLOCKS(old_dir->i_sb); |
1251 | 1251 | ||
1252 | vfs_dq_init(old_dir); | 1252 | dquot_initialize(old_dir); |
1253 | vfs_dq_init(new_dir); | 1253 | dquot_initialize(new_dir); |
1254 | 1254 | ||
1255 | old_inode = old_dentry->d_inode; | 1255 | old_inode = old_dentry->d_inode; |
1256 | new_dentry_inode = new_dentry->d_inode; | 1256 | new_dentry_inode = new_dentry->d_inode; |