diff options
author | Christoph Hellwig <hch@infradead.org> | 2010-03-03 09:05:07 -0500 |
---|---|---|
committer | Jan Kara <jack@suse.cz> | 2010-03-04 18:20:30 -0500 |
commit | 871a293155a24554e153538d36e3a80fa169aefb (patch) | |
tree | 7e38f5a2f9e87f63cbc4bc1077a4bb49dde441b0 /fs/udf/namei.c | |
parent | 907f4554e2521cb28b0009d17167760650a9561c (diff) |
dquot: cleanup dquot initialize routine
Get rid of the initialize dquot operation - it is now always called from
the filesystem and if a filesystem really needs it's own (which none
currently does) it can just call into it's own routine directly.
Rename the now static low-level dquot_initialize helper to __dquot_initialize
and vfs_dq_init to dquot_initialize to have a consistent namespace.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Jan Kara <jack@suse.cz>
Diffstat (limited to 'fs/udf/namei.c')
-rw-r--r-- | fs/udf/namei.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/fs/udf/namei.c b/fs/udf/namei.c index e360c3fc4ae4..96757e3e3e04 100644 --- a/fs/udf/namei.c +++ b/fs/udf/namei.c | |||
@@ -563,7 +563,7 @@ static int udf_create(struct inode *dir, struct dentry *dentry, int mode, | |||
563 | int err; | 563 | int err; |
564 | struct udf_inode_info *iinfo; | 564 | struct udf_inode_info *iinfo; |
565 | 565 | ||
566 | vfs_dq_init(dir); | 566 | dquot_initialize(dir); |
567 | 567 | ||
568 | lock_kernel(); | 568 | lock_kernel(); |
569 | inode = udf_new_inode(dir, mode, &err); | 569 | inode = udf_new_inode(dir, mode, &err); |
@@ -618,7 +618,7 @@ static int udf_mknod(struct inode *dir, struct dentry *dentry, int mode, | |||
618 | if (!old_valid_dev(rdev)) | 618 | if (!old_valid_dev(rdev)) |
619 | return -EINVAL; | 619 | return -EINVAL; |
620 | 620 | ||
621 | vfs_dq_init(dir); | 621 | dquot_initialize(dir); |
622 | 622 | ||
623 | lock_kernel(); | 623 | lock_kernel(); |
624 | err = -EIO; | 624 | err = -EIO; |
@@ -666,7 +666,7 @@ static int udf_mkdir(struct inode *dir, struct dentry *dentry, int mode) | |||
666 | struct udf_inode_info *dinfo = UDF_I(dir); | 666 | struct udf_inode_info *dinfo = UDF_I(dir); |
667 | struct udf_inode_info *iinfo; | 667 | struct udf_inode_info *iinfo; |
668 | 668 | ||
669 | vfs_dq_init(dir); | 669 | dquot_initialize(dir); |
670 | 670 | ||
671 | lock_kernel(); | 671 | lock_kernel(); |
672 | err = -EMLINK; | 672 | err = -EMLINK; |
@@ -805,7 +805,7 @@ static int udf_rmdir(struct inode *dir, struct dentry *dentry) | |||
805 | struct fileIdentDesc *fi, cfi; | 805 | struct fileIdentDesc *fi, cfi; |
806 | struct kernel_lb_addr tloc; | 806 | struct kernel_lb_addr tloc; |
807 | 807 | ||
808 | vfs_dq_init(dir); | 808 | dquot_initialize(dir); |
809 | 809 | ||
810 | retval = -ENOENT; | 810 | retval = -ENOENT; |
811 | lock_kernel(); | 811 | lock_kernel(); |
@@ -853,7 +853,7 @@ static int udf_unlink(struct inode *dir, struct dentry *dentry) | |||
853 | struct fileIdentDesc cfi; | 853 | struct fileIdentDesc cfi; |
854 | struct kernel_lb_addr tloc; | 854 | struct kernel_lb_addr tloc; |
855 | 855 | ||
856 | vfs_dq_init(dir); | 856 | dquot_initialize(dir); |
857 | 857 | ||
858 | retval = -ENOENT; | 858 | retval = -ENOENT; |
859 | lock_kernel(); | 859 | lock_kernel(); |
@@ -909,7 +909,7 @@ static int udf_symlink(struct inode *dir, struct dentry *dentry, | |||
909 | struct buffer_head *bh; | 909 | struct buffer_head *bh; |
910 | struct udf_inode_info *iinfo; | 910 | struct udf_inode_info *iinfo; |
911 | 911 | ||
912 | vfs_dq_init(dir); | 912 | dquot_initialize(dir); |
913 | 913 | ||
914 | lock_kernel(); | 914 | lock_kernel(); |
915 | inode = udf_new_inode(dir, S_IFLNK, &err); | 915 | inode = udf_new_inode(dir, S_IFLNK, &err); |
@@ -1081,7 +1081,7 @@ static int udf_link(struct dentry *old_dentry, struct inode *dir, | |||
1081 | int err; | 1081 | int err; |
1082 | struct buffer_head *bh; | 1082 | struct buffer_head *bh; |
1083 | 1083 | ||
1084 | vfs_dq_init(dir); | 1084 | dquot_initialize(dir); |
1085 | 1085 | ||
1086 | lock_kernel(); | 1086 | lock_kernel(); |
1087 | if (inode->i_nlink >= (256 << sizeof(inode->i_nlink)) - 1) { | 1087 | if (inode->i_nlink >= (256 << sizeof(inode->i_nlink)) - 1) { |
@@ -1145,8 +1145,8 @@ static int udf_rename(struct inode *old_dir, struct dentry *old_dentry, | |||
1145 | struct kernel_lb_addr tloc; | 1145 | struct kernel_lb_addr tloc; |
1146 | struct udf_inode_info *old_iinfo = UDF_I(old_inode); | 1146 | struct udf_inode_info *old_iinfo = UDF_I(old_inode); |
1147 | 1147 | ||
1148 | vfs_dq_init(old_dir); | 1148 | dquot_initialize(old_dir); |
1149 | vfs_dq_init(new_dir); | 1149 | dquot_initialize(new_dir); |
1150 | 1150 | ||
1151 | lock_kernel(); | 1151 | lock_kernel(); |
1152 | ofi = udf_find_entry(old_dir, &old_dentry->d_name, &ofibh, &ocfi); | 1152 | ofi = udf_find_entry(old_dir, &old_dentry->d_name, &ofibh, &ocfi); |