aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristoph Hellwig <hch@infradead.org>2010-05-19 07:16:45 -0400
committerJan Kara <jack@suse.cz>2010-05-24 08:10:17 -0400
commit287a80958cf63fc5c68d5bf6e89a3669dd66234a (patch)
tree8e6883881709ffbbe3b1d6cb7a5b4dcef3428380
parent123e9caf1e85008ab7eb5f6cd58c44f9a5d73b2b (diff)
quota: rename default quotactl methods to dquot_
Follow the dquot_* style used elsewhere in dquot.c. [Jan Kara: Fixed up missing conversion of ext2] Signed-off-by: Christoph Hellwig <hch@lst.de> Signed-off-by: Jan Kara <jack@suse.cz>
-rw-r--r--fs/ext2/super.c2
-rw-r--r--fs/ext3/super.c20
-rw-r--r--fs/ext4/super.c20
-rw-r--r--fs/jfs/super.c2
-rw-r--r--fs/ocfs2/super.c18
-rw-r--r--fs/quota/dquot.c64
-rw-r--r--fs/reiserfs/super.c20
-rw-r--r--fs/udf/super.c2
-rw-r--r--fs/ufs/super.c2
-rw-r--r--include/linux/quotaops.h22
10 files changed, 86 insertions, 86 deletions
diff --git a/fs/ext2/super.c b/fs/ext2/super.c
index df752b71b869..7ff43f4a59cd 100644
--- a/fs/ext2/super.c
+++ b/fs/ext2/super.c
@@ -1068,7 +1068,7 @@ static int ext2_fill_super(struct super_block *sb, void *data, int silent)
1068 1068
1069#ifdef CONFIG_QUOTA 1069#ifdef CONFIG_QUOTA
1070 sb->dq_op = &dquot_operations; 1070 sb->dq_op = &dquot_operations;
1071 sb->s_qcop = &vfs_quotactl_ops; 1071 sb->s_qcop = &dquot_quotactl_ops;
1072#endif 1072#endif
1073 1073
1074 root = ext2_iget(sb, EXT2_ROOT_INO); 1074 root = ext2_iget(sb, EXT2_ROOT_INO);
diff --git a/fs/ext3/super.c b/fs/ext3/super.c
index e52006737b4b..6c953bb255e7 100644
--- a/fs/ext3/super.c
+++ b/fs/ext3/super.c
@@ -769,12 +769,12 @@ static const struct dquot_operations ext3_quota_operations = {
769 769
770static const struct quotactl_ops ext3_qctl_operations = { 770static const struct quotactl_ops ext3_qctl_operations = {
771 .quota_on = ext3_quota_on, 771 .quota_on = ext3_quota_on,
772 .quota_off = vfs_quota_off, 772 .quota_off = dquot_quota_off,
773 .quota_sync = vfs_quota_sync, 773 .quota_sync = dquot_quota_sync,
774 .get_info = vfs_get_dqinfo, 774 .get_info = dquot_get_dqinfo,
775 .set_info = vfs_set_dqinfo, 775 .set_info = dquot_set_dqinfo,
776 .get_dqblk = vfs_get_dqblk, 776 .get_dqblk = dquot_get_dqblk,
777 .set_dqblk = vfs_set_dqblk 777 .set_dqblk = dquot_set_dqblk
778}; 778};
779#endif 779#endif
780 780
@@ -1529,7 +1529,7 @@ static void ext3_orphan_cleanup (struct super_block * sb,
1529 /* Turn quotas off */ 1529 /* Turn quotas off */
1530 for (i = 0; i < MAXQUOTAS; i++) { 1530 for (i = 0; i < MAXQUOTAS; i++) {
1531 if (sb_dqopt(sb)->files[i]) 1531 if (sb_dqopt(sb)->files[i])
1532 vfs_quota_off(sb, i); 1532 dquot_quota_off(sb, i);
1533 } 1533 }
1534#endif 1534#endif
1535 sb->s_flags = s_flags; /* Restore MS_RDONLY status */ 1535 sb->s_flags = s_flags; /* Restore MS_RDONLY status */
@@ -2862,8 +2862,8 @@ static int ext3_write_info(struct super_block *sb, int type)
2862 */ 2862 */
2863static int ext3_quota_on_mount(struct super_block *sb, int type) 2863static int ext3_quota_on_mount(struct super_block *sb, int type)
2864{ 2864{
2865 return vfs_quota_on_mount(sb, EXT3_SB(sb)->s_qf_names[type], 2865 return dquot_quota_on_mount(sb, EXT3_SB(sb)->s_qf_names[type],
2866 EXT3_SB(sb)->s_jquota_fmt, type); 2866 EXT3_SB(sb)->s_jquota_fmt, type);
2867} 2867}
2868 2868
2869/* 2869/*
@@ -2914,7 +2914,7 @@ static int ext3_quota_on(struct super_block *sb, int type, int format_id,
2914 } 2914 }
2915 } 2915 }
2916 2916
2917 err = vfs_quota_on_path(sb, type, format_id, &path); 2917 err = dquot_quota_on_path(sb, type, format_id, &path);
2918 path_put(&path); 2918 path_put(&path);
2919 return err; 2919 return err;
2920} 2920}
diff --git a/fs/ext4/super.c b/fs/ext4/super.c
index dfe9bf503f85..381e5a931265 100644
--- a/fs/ext4/super.c
+++ b/fs/ext4/super.c
@@ -1083,12 +1083,12 @@ static const struct dquot_operations ext4_quota_operations = {
1083 1083
1084static const struct quotactl_ops ext4_qctl_operations = { 1084static const struct quotactl_ops ext4_qctl_operations = {
1085 .quota_on = ext4_quota_on, 1085 .quota_on = ext4_quota_on,
1086 .quota_off = vfs_quota_off, 1086 .quota_off = dquot_quota_off,
1087 .quota_sync = vfs_quota_sync, 1087 .quota_sync = dquot_quota_sync,
1088 .get_info = vfs_get_dqinfo, 1088 .get_info = dquot_get_dqinfo,
1089 .set_info = vfs_set_dqinfo, 1089 .set_info = dquot_set_dqinfo,
1090 .get_dqblk = vfs_get_dqblk, 1090 .get_dqblk = dquot_get_dqblk,
1091 .set_dqblk = vfs_set_dqblk 1091 .set_dqblk = dquot_set_dqblk
1092}; 1092};
1093#endif 1093#endif
1094 1094
@@ -2053,7 +2053,7 @@ static void ext4_orphan_cleanup(struct super_block *sb,
2053 /* Turn quotas off */ 2053 /* Turn quotas off */
2054 for (i = 0; i < MAXQUOTAS; i++) { 2054 for (i = 0; i < MAXQUOTAS; i++) {
2055 if (sb_dqopt(sb)->files[i]) 2055 if (sb_dqopt(sb)->files[i])
2056 vfs_quota_off(sb, i); 2056 dquot_quota_off(sb, i);
2057 } 2057 }
2058#endif 2058#endif
2059 sb->s_flags = s_flags; /* Restore MS_RDONLY status */ 2059 sb->s_flags = s_flags; /* Restore MS_RDONLY status */
@@ -3916,8 +3916,8 @@ static int ext4_write_info(struct super_block *sb, int type)
3916 */ 3916 */
3917static int ext4_quota_on_mount(struct super_block *sb, int type) 3917static int ext4_quota_on_mount(struct super_block *sb, int type)
3918{ 3918{
3919 return vfs_quota_on_mount(sb, EXT4_SB(sb)->s_qf_names[type], 3919 return dquot_quota_on_mount(sb, EXT4_SB(sb)->s_qf_names[type],
3920 EXT4_SB(sb)->s_jquota_fmt, type); 3920 EXT4_SB(sb)->s_jquota_fmt, type);
3921} 3921}
3922 3922
3923/* 3923/*
@@ -3969,7 +3969,7 @@ static int ext4_quota_on(struct super_block *sb, int type, int format_id,
3969 } 3969 }
3970 } 3970 }
3971 3971
3972 err = vfs_quota_on_path(sb, type, format_id, &path); 3972 err = dquot_quota_on_path(sb, type, format_id, &path);
3973 path_put(&path); 3973 path_put(&path);
3974 return err; 3974 return err;
3975} 3975}
diff --git a/fs/jfs/super.c b/fs/jfs/super.c
index 2e7ec5e8cda4..b38f96bef829 100644
--- a/fs/jfs/super.c
+++ b/fs/jfs/super.c
@@ -483,7 +483,7 @@ static int jfs_fill_super(struct super_block *sb, void *data, int silent)
483 sb->s_export_op = &jfs_export_operations; 483 sb->s_export_op = &jfs_export_operations;
484#ifdef CONFIG_QUOTA 484#ifdef CONFIG_QUOTA
485 sb->dq_op = &dquot_operations; 485 sb->dq_op = &dquot_operations;
486 sb->s_qcop = &vfs_quotactl_ops; 486 sb->s_qcop = &dquot_quotactl_ops;
487#endif 487#endif
488 488
489 /* 489 /*
diff --git a/fs/ocfs2/super.c b/fs/ocfs2/super.c
index 5367d6dee395..0eaa929a4dbf 100644
--- a/fs/ocfs2/super.c
+++ b/fs/ocfs2/super.c
@@ -918,8 +918,8 @@ static int ocfs2_enable_quotas(struct ocfs2_super *osb)
918 status = -ENOENT; 918 status = -ENOENT;
919 goto out_quota_off; 919 goto out_quota_off;
920 } 920 }
921 status = vfs_quota_enable(inode[type], type, QFMT_OCFS2, 921 status = dquot_enable(inode[type], type, QFMT_OCFS2,
922 DQUOT_USAGE_ENABLED); 922 DQUOT_USAGE_ENABLED);
923 if (status < 0) 923 if (status < 0)
924 goto out_quota_off; 924 goto out_quota_off;
925 } 925 }
@@ -972,8 +972,8 @@ static int ocfs2_quota_on(struct super_block *sb, int type, int format_id,
972 if (!OCFS2_HAS_RO_COMPAT_FEATURE(sb, feature[type])) 972 if (!OCFS2_HAS_RO_COMPAT_FEATURE(sb, feature[type]))
973 return -EINVAL; 973 return -EINVAL;
974 974
975 return vfs_quota_enable(sb_dqopt(sb)->files[type], type, 975 return dquot_enable(sb_dqopt(sb)->files[type], type,
976 format_id, DQUOT_LIMITS_ENABLED); 976 format_id, DQUOT_LIMITS_ENABLED);
977} 977}
978 978
979/* Handle quota off quotactl */ 979/* Handle quota off quotactl */
@@ -985,11 +985,11 @@ static int ocfs2_quota_off(struct super_block *sb, int type)
985static const struct quotactl_ops ocfs2_quotactl_ops = { 985static const struct quotactl_ops ocfs2_quotactl_ops = {
986 .quota_on = ocfs2_quota_on, 986 .quota_on = ocfs2_quota_on,
987 .quota_off = ocfs2_quota_off, 987 .quota_off = ocfs2_quota_off,
988 .quota_sync = vfs_quota_sync, 988 .quota_sync = dquot_quota_sync,
989 .get_info = vfs_get_dqinfo, 989 .get_info = dquot_get_dqinfo,
990 .set_info = vfs_set_dqinfo, 990 .set_info = dquot_set_dqinfo,
991 .get_dqblk = vfs_get_dqblk, 991 .get_dqblk = dquot_get_dqblk,
992 .set_dqblk = vfs_set_dqblk, 992 .set_dqblk = dquot_set_dqblk,
993}; 993};
994 994
995static int ocfs2_fill_super(struct super_block *sb, void *data, int silent) 995static int ocfs2_fill_super(struct super_block *sb, void *data, int silent)
diff --git a/fs/quota/dquot.c b/fs/quota/dquot.c
index 9ba526e3f719..1914a2f6c84c 100644
--- a/fs/quota/dquot.c
+++ b/fs/quota/dquot.c
@@ -584,7 +584,7 @@ out:
584} 584}
585EXPORT_SYMBOL(dquot_scan_active); 585EXPORT_SYMBOL(dquot_scan_active);
586 586
587int vfs_quota_sync(struct super_block *sb, int type, int wait) 587int dquot_quota_sync(struct super_block *sb, int type, int wait)
588{ 588{
589 struct list_head *dirty; 589 struct list_head *dirty;
590 struct dquot *dquot; 590 struct dquot *dquot;
@@ -656,7 +656,7 @@ int vfs_quota_sync(struct super_block *sb, int type, int wait)
656 656
657 return 0; 657 return 0;
658} 658}
659EXPORT_SYMBOL(vfs_quota_sync); 659EXPORT_SYMBOL(dquot_quota_sync);
660 660
661/* Free unused dquots from cache */ 661/* Free unused dquots from cache */
662static void prune_dqcache(int count) 662static void prune_dqcache(int count)
@@ -1998,12 +1998,12 @@ put_inodes:
1998} 1998}
1999EXPORT_SYMBOL(dquot_disable); 1999EXPORT_SYMBOL(dquot_disable);
2000 2000
2001int vfs_quota_off(struct super_block *sb, int type) 2001int dquot_quota_off(struct super_block *sb, int type)
2002{ 2002{
2003 return dquot_disable(sb, type, 2003 return dquot_disable(sb, type,
2004 DQUOT_USAGE_ENABLED | DQUOT_LIMITS_ENABLED); 2004 DQUOT_USAGE_ENABLED | DQUOT_LIMITS_ENABLED);
2005} 2005}
2006EXPORT_SYMBOL(vfs_quota_off); 2006EXPORT_SYMBOL(dquot_quota_off);
2007 2007
2008/* 2008/*
2009 * Turn quotas on on a device 2009 * Turn quotas on on a device
@@ -2158,7 +2158,7 @@ int dquot_resume(struct super_block *sb, int type)
2158} 2158}
2159EXPORT_SYMBOL(dquot_resume); 2159EXPORT_SYMBOL(dquot_resume);
2160 2160
2161int vfs_quota_on_path(struct super_block *sb, int type, int format_id, 2161int dquot_quota_on_path(struct super_block *sb, int type, int format_id,
2162 struct path *path) 2162 struct path *path)
2163{ 2163{
2164 int error = security_quota_on(path->dentry); 2164 int error = security_quota_on(path->dentry);
@@ -2173,28 +2173,28 @@ int vfs_quota_on_path(struct super_block *sb, int type, int format_id,
2173 DQUOT_LIMITS_ENABLED); 2173 DQUOT_LIMITS_ENABLED);
2174 return error; 2174 return error;
2175} 2175}
2176EXPORT_SYMBOL(vfs_quota_on_path); 2176EXPORT_SYMBOL(dquot_quota_on_path);
2177 2177
2178int vfs_quota_on(struct super_block *sb, int type, int format_id, char *name) 2178int dquot_quota_on(struct super_block *sb, int type, int format_id, char *name)
2179{ 2179{
2180 struct path path; 2180 struct path path;
2181 int error; 2181 int error;
2182 2182
2183 error = kern_path(name, LOOKUP_FOLLOW, &path); 2183 error = kern_path(name, LOOKUP_FOLLOW, &path);
2184 if (!error) { 2184 if (!error) {
2185 error = vfs_quota_on_path(sb, type, format_id, &path); 2185 error = dquot_quota_on_path(sb, type, format_id, &path);
2186 path_put(&path); 2186 path_put(&path);
2187 } 2187 }
2188 return error; 2188 return error;
2189} 2189}
2190EXPORT_SYMBOL(vfs_quota_on); 2190EXPORT_SYMBOL(dquot_quota_on);
2191 2191
2192/* 2192/*
2193 * More powerful function for turning on quotas allowing setting 2193 * More powerful function for turning on quotas allowing setting
2194 * of individual quota flags 2194 * of individual quota flags
2195 */ 2195 */
2196int vfs_quota_enable(struct inode *inode, int type, int format_id, 2196int dquot_enable(struct inode *inode, int type, int format_id,
2197 unsigned int flags) 2197 unsigned int flags)
2198{ 2198{
2199 int ret = 0; 2199 int ret = 0;
2200 struct super_block *sb = inode->i_sb; 2200 struct super_block *sb = inode->i_sb;
@@ -2234,13 +2234,13 @@ out_lock:
2234load_quota: 2234load_quota:
2235 return vfs_load_quota_inode(inode, type, format_id, flags); 2235 return vfs_load_quota_inode(inode, type, format_id, flags);
2236} 2236}
2237EXPORT_SYMBOL(vfs_quota_enable); 2237EXPORT_SYMBOL(dquot_enable);
2238 2238
2239/* 2239/*
2240 * This function is used when filesystem needs to initialize quotas 2240 * This function is used when filesystem needs to initialize quotas
2241 * during mount time. 2241 * during mount time.
2242 */ 2242 */
2243int vfs_quota_on_mount(struct super_block *sb, char *qf_name, 2243int dquot_quota_on_mount(struct super_block *sb, char *qf_name,
2244 int format_id, int type) 2244 int format_id, int type)
2245{ 2245{
2246 struct dentry *dentry; 2246 struct dentry *dentry;
@@ -2266,7 +2266,7 @@ out:
2266 dput(dentry); 2266 dput(dentry);
2267 return error; 2267 return error;
2268} 2268}
2269EXPORT_SYMBOL(vfs_quota_on_mount); 2269EXPORT_SYMBOL(dquot_quota_on_mount);
2270 2270
2271static inline qsize_t qbtos(qsize_t blocks) 2271static inline qsize_t qbtos(qsize_t blocks)
2272{ 2272{
@@ -2301,8 +2301,8 @@ static void do_get_dqblk(struct dquot *dquot, struct fs_disk_quota *di)
2301 spin_unlock(&dq_data_lock); 2301 spin_unlock(&dq_data_lock);
2302} 2302}
2303 2303
2304int vfs_get_dqblk(struct super_block *sb, int type, qid_t id, 2304int dquot_get_dqblk(struct super_block *sb, int type, qid_t id,
2305 struct fs_disk_quota *di) 2305 struct fs_disk_quota *di)
2306{ 2306{
2307 struct dquot *dquot; 2307 struct dquot *dquot;
2308 2308
@@ -2314,7 +2314,7 @@ int vfs_get_dqblk(struct super_block *sb, int type, qid_t id,
2314 2314
2315 return 0; 2315 return 0;
2316} 2316}
2317EXPORT_SYMBOL(vfs_get_dqblk); 2317EXPORT_SYMBOL(dquot_get_dqblk);
2318 2318
2319#define VFS_FS_DQ_MASK \ 2319#define VFS_FS_DQ_MASK \
2320 (FS_DQ_BCOUNT | FS_DQ_BSOFT | FS_DQ_BHARD | \ 2320 (FS_DQ_BCOUNT | FS_DQ_BSOFT | FS_DQ_BHARD | \
@@ -2413,7 +2413,7 @@ static int do_set_dqblk(struct dquot *dquot, struct fs_disk_quota *di)
2413 return 0; 2413 return 0;
2414} 2414}
2415 2415
2416int vfs_set_dqblk(struct super_block *sb, int type, qid_t id, 2416int dquot_set_dqblk(struct super_block *sb, int type, qid_t id,
2417 struct fs_disk_quota *di) 2417 struct fs_disk_quota *di)
2418{ 2418{
2419 struct dquot *dquot; 2419 struct dquot *dquot;
@@ -2429,10 +2429,10 @@ int vfs_set_dqblk(struct super_block *sb, int type, qid_t id,
2429out: 2429out:
2430 return rc; 2430 return rc;
2431} 2431}
2432EXPORT_SYMBOL(vfs_set_dqblk); 2432EXPORT_SYMBOL(dquot_set_dqblk);
2433 2433
2434/* Generic routine for getting common part of quota file information */ 2434/* Generic routine for getting common part of quota file information */
2435int vfs_get_dqinfo(struct super_block *sb, int type, struct if_dqinfo *ii) 2435int dquot_get_dqinfo(struct super_block *sb, int type, struct if_dqinfo *ii)
2436{ 2436{
2437 struct mem_dqinfo *mi; 2437 struct mem_dqinfo *mi;
2438 2438
@@ -2451,10 +2451,10 @@ int vfs_get_dqinfo(struct super_block *sb, int type, struct if_dqinfo *ii)
2451 mutex_unlock(&sb_dqopt(sb)->dqonoff_mutex); 2451 mutex_unlock(&sb_dqopt(sb)->dqonoff_mutex);
2452 return 0; 2452 return 0;
2453} 2453}
2454EXPORT_SYMBOL(vfs_get_dqinfo); 2454EXPORT_SYMBOL(dquot_get_dqinfo);
2455 2455
2456/* Generic routine for setting common part of quota file information */ 2456/* Generic routine for setting common part of quota file information */
2457int vfs_set_dqinfo(struct super_block *sb, int type, struct if_dqinfo *ii) 2457int dquot_set_dqinfo(struct super_block *sb, int type, struct if_dqinfo *ii)
2458{ 2458{
2459 struct mem_dqinfo *mi; 2459 struct mem_dqinfo *mi;
2460 int err = 0; 2460 int err = 0;
@@ -2481,18 +2481,18 @@ out:
2481 mutex_unlock(&sb_dqopt(sb)->dqonoff_mutex); 2481 mutex_unlock(&sb_dqopt(sb)->dqonoff_mutex);
2482 return err; 2482 return err;
2483} 2483}
2484EXPORT_SYMBOL(vfs_set_dqinfo); 2484EXPORT_SYMBOL(dquot_set_dqinfo);
2485 2485
2486const struct quotactl_ops vfs_quotactl_ops = { 2486const struct quotactl_ops dquot_quotactl_ops = {
2487 .quota_on = vfs_quota_on, 2487 .quota_on = dquot_quota_on,
2488 .quota_off = vfs_quota_off, 2488 .quota_off = dquot_quota_off,
2489 .quota_sync = vfs_quota_sync, 2489 .quota_sync = dquot_quota_sync,
2490 .get_info = vfs_get_dqinfo, 2490 .get_info = dquot_get_dqinfo,
2491 .set_info = vfs_set_dqinfo, 2491 .set_info = dquot_set_dqinfo,
2492 .get_dqblk = vfs_get_dqblk, 2492 .get_dqblk = dquot_get_dqblk,
2493 .set_dqblk = vfs_set_dqblk 2493 .set_dqblk = dquot_set_dqblk
2494}; 2494};
2495EXPORT_SYMBOL(vfs_quotactl_ops); 2495EXPORT_SYMBOL(dquot_quotactl_ops);
2496 2496
2497static int do_proc_dqstats(struct ctl_table *table, int write, 2497static int do_proc_dqstats(struct ctl_table *table, int write,
2498 void __user *buffer, size_t *lenp, loff_t *ppos) 2498 void __user *buffer, size_t *lenp, loff_t *ppos)
diff --git a/fs/reiserfs/super.c b/fs/reiserfs/super.c
index fa46abd0d958..f0ab5c94139c 100644
--- a/fs/reiserfs/super.c
+++ b/fs/reiserfs/super.c
@@ -305,7 +305,7 @@ static int finish_unfinished(struct super_block *s)
305 /* Turn quotas off */ 305 /* Turn quotas off */
306 for (i = 0; i < MAXQUOTAS; i++) { 306 for (i = 0; i < MAXQUOTAS; i++) {
307 if (sb_dqopt(s)->files[i]) 307 if (sb_dqopt(s)->files[i])
308 vfs_quota_off(s, i); 308 dquot_quota_off(s, i);
309 } 309 }
310 if (ms_active_set) 310 if (ms_active_set)
311 /* Restore the flag back */ 311 /* Restore the flag back */
@@ -636,12 +636,12 @@ static const struct dquot_operations reiserfs_quota_operations = {
636 636
637static const struct quotactl_ops reiserfs_qctl_operations = { 637static const struct quotactl_ops reiserfs_qctl_operations = {
638 .quota_on = reiserfs_quota_on, 638 .quota_on = reiserfs_quota_on,
639 .quota_off = vfs_quota_off, 639 .quota_off = dquot_quota_off,
640 .quota_sync = vfs_quota_sync, 640 .quota_sync = dquot_quota_sync,
641 .get_info = vfs_get_dqinfo, 641 .get_info = dquot_get_dqinfo,
642 .set_info = vfs_set_dqinfo, 642 .set_info = dquot_set_dqinfo,
643 .get_dqblk = vfs_get_dqblk, 643 .get_dqblk = dquot_get_dqblk,
644 .set_dqblk = vfs_set_dqblk, 644 .set_dqblk = dquot_set_dqblk,
645}; 645};
646#endif 646#endif
647 647
@@ -2030,8 +2030,8 @@ static int reiserfs_write_info(struct super_block *sb, int type)
2030 */ 2030 */
2031static int reiserfs_quota_on_mount(struct super_block *sb, int type) 2031static int reiserfs_quota_on_mount(struct super_block *sb, int type)
2032{ 2032{
2033 return vfs_quota_on_mount(sb, REISERFS_SB(sb)->s_qf_names[type], 2033 return dquot_quota_on_mount(sb, REISERFS_SB(sb)->s_qf_names[type],
2034 REISERFS_SB(sb)->s_jquota_fmt, type); 2034 REISERFS_SB(sb)->s_jquota_fmt, type);
2035} 2035}
2036 2036
2037/* 2037/*
@@ -2091,7 +2091,7 @@ static int reiserfs_quota_on(struct super_block *sb, int type, int format_id,
2091 if (err) 2091 if (err)
2092 goto out; 2092 goto out;
2093 } 2093 }
2094 err = vfs_quota_on_path(sb, type, format_id, &path); 2094 err = dquot_quota_on_path(sb, type, format_id, &path);
2095out: 2095out:
2096 path_put(&path); 2096 path_put(&path);
2097 return err; 2097 return err;
diff --git a/fs/udf/super.c b/fs/udf/super.c
index ef9221b7456e..5e03592369d7 100644
--- a/fs/udf/super.c
+++ b/fs/udf/super.c
@@ -1949,7 +1949,7 @@ static int udf_fill_super(struct super_block *sb, void *options, int silent)
1949 sb->s_op = &udf_sb_ops; 1949 sb->s_op = &udf_sb_ops;
1950 sb->s_export_op = &udf_export_ops; 1950 sb->s_export_op = &udf_export_ops;
1951#ifdef CONFIG_QUOTA 1951#ifdef CONFIG_QUOTA
1952 sb->s_qcop = &vfs_quotactl_ops; 1952 sb->s_qcop = &dquot_quotactl_ops;
1953 sb->dq_op = NULL; /* &dquot_operations */ 1953 sb->dq_op = NULL; /* &dquot_operations */
1954#endif 1954#endif
1955 1955
diff --git a/fs/ufs/super.c b/fs/ufs/super.c
index 60c989b7012f..2b08a8dd8ec0 100644
--- a/fs/ufs/super.c
+++ b/fs/ufs/super.c
@@ -1046,7 +1046,7 @@ magic_found:
1046 sb->s_op = &ufs_super_ops; 1046 sb->s_op = &ufs_super_ops;
1047 sb->s_export_op = &ufs_export_ops; 1047 sb->s_export_op = &ufs_export_ops;
1048#ifdef CONFIG_QUOTA 1048#ifdef CONFIG_QUOTA
1049 sb->s_qcop = &vfs_quotactl_ops; 1049 sb->s_qcop = &dquot_quotactl_ops;
1050 sb->dq_op = NULL; /* &dquot_operations */ 1050 sb->dq_op = NULL; /* &dquot_operations */
1051#endif 1051#endif
1052 1052
diff --git a/include/linux/quotaops.h b/include/linux/quotaops.h
index 84b8dbf59c03..0c77cd8d2822 100644
--- a/include/linux/quotaops.h
+++ b/include/linux/quotaops.h
@@ -66,21 +66,21 @@ int dquot_mark_dquot_dirty(struct dquot *dquot);
66 66
67int dquot_file_open(struct inode *inode, struct file *file); 67int dquot_file_open(struct inode *inode, struct file *file);
68 68
69int vfs_quota_on(struct super_block *sb, int type, int format_id, 69int dquot_quota_on(struct super_block *sb, int type, int format_id,
70 char *path); 70 char *path);
71int vfs_quota_enable(struct inode *inode, int type, int format_id, 71int dquot_enable(struct inode *inode, int type, int format_id,
72 unsigned int flags); 72 unsigned int flags);
73int vfs_quota_on_path(struct super_block *sb, int type, int format_id, 73int dquot_quota_on_path(struct super_block *sb, int type, int format_id,
74 struct path *path); 74 struct path *path);
75int vfs_quota_on_mount(struct super_block *sb, char *qf_name, 75int dquot_quota_on_mount(struct super_block *sb, char *qf_name,
76 int format_id, int type); 76 int format_id, int type);
77int vfs_quota_off(struct super_block *sb, int type); 77int dquot_quota_off(struct super_block *sb, int type);
78int vfs_quota_sync(struct super_block *sb, int type, int wait); 78int dquot_quota_sync(struct super_block *sb, int type, int wait);
79int vfs_get_dqinfo(struct super_block *sb, int type, struct if_dqinfo *ii); 79int dquot_get_dqinfo(struct super_block *sb, int type, struct if_dqinfo *ii);
80int vfs_set_dqinfo(struct super_block *sb, int type, struct if_dqinfo *ii); 80int dquot_set_dqinfo(struct super_block *sb, int type, struct if_dqinfo *ii);
81int vfs_get_dqblk(struct super_block *sb, int type, qid_t id, 81int dquot_get_dqblk(struct super_block *sb, int type, qid_t id,
82 struct fs_disk_quota *di); 82 struct fs_disk_quota *di);
83int vfs_set_dqblk(struct super_block *sb, int type, qid_t id, 83int dquot_set_dqblk(struct super_block *sb, int type, qid_t id,
84 struct fs_disk_quota *di); 84 struct fs_disk_quota *di);
85 85
86int __dquot_transfer(struct inode *inode, struct dquot **transfer_to); 86int __dquot_transfer(struct inode *inode, struct dquot **transfer_to);
@@ -151,7 +151,7 @@ static inline unsigned sb_any_quota_active(struct super_block *sb)
151 * Operations supported for diskquotas. 151 * Operations supported for diskquotas.
152 */ 152 */
153extern const struct dquot_operations dquot_operations; 153extern const struct dquot_operations dquot_operations;
154extern const struct quotactl_ops vfs_quotactl_ops; 154extern const struct quotactl_ops dquot_quotactl_ops;
155 155
156#else 156#else
157 157