diff options
author | Jan Kara <jack@suse.cz> | 2010-05-19 10:28:56 -0400 |
---|---|---|
committer | Jan Kara <jack@suse.cz> | 2010-05-24 08:10:19 -0400 |
commit | 36350462814739e1f38cba59a6900ebadb08d3bb (patch) | |
tree | 09c1f17c5a264a50028a1ea25f3fd681734d2058 /fs/udf/super.c | |
parent | 287a80958cf63fc5c68d5bf6e89a3669dd66234a (diff) |
udf: Remove dead quota code
Quota on UDF is non-functional at least since 2.6.16 (I'm too lazy to
do more archeology) because it does not provide .quota_write and .quota_read
functions and thus quotaon(8) just returns EINVAL. Since nobody complained
for all those years and quota support is not even in UDF standard just nuke
it.
Signed-off-by: Jan Kara <jack@suse.cz>
Diffstat (limited to 'fs/udf/super.c')
-rw-r--r-- | fs/udf/super.c | 18 |
1 files changed, 2 insertions, 16 deletions
diff --git a/fs/udf/super.c b/fs/udf/super.c index 5e03592369d7..612d1e2e285a 100644 --- a/fs/udf/super.c +++ b/fs/udf/super.c | |||
@@ -54,7 +54,6 @@ | |||
54 | #include <linux/vmalloc.h> | 54 | #include <linux/vmalloc.h> |
55 | #include <linux/errno.h> | 55 | #include <linux/errno.h> |
56 | #include <linux/mount.h> | 56 | #include <linux/mount.h> |
57 | #include <linux/quotaops.h> | ||
58 | #include <linux/seq_file.h> | 57 | #include <linux/seq_file.h> |
59 | #include <linux/bitmap.h> | 58 | #include <linux/bitmap.h> |
60 | #include <linux/crc-itu-t.h> | 59 | #include <linux/crc-itu-t.h> |
@@ -587,18 +586,11 @@ static int udf_remount_fs(struct super_block *sb, int *flags, char *options) | |||
587 | if ((*flags & MS_RDONLY) == (sb->s_flags & MS_RDONLY)) | 586 | if ((*flags & MS_RDONLY) == (sb->s_flags & MS_RDONLY)) |
588 | goto out_unlock; | 587 | goto out_unlock; |
589 | 588 | ||
590 | if (*flags & MS_RDONLY) { | 589 | if (*flags & MS_RDONLY) |
591 | udf_close_lvid(sb); | 590 | udf_close_lvid(sb); |
592 | 591 | else | |
593 | error = dquot_suspend(sb, -1); | ||
594 | } else { | ||
595 | udf_open_lvid(sb); | 592 | udf_open_lvid(sb); |
596 | 593 | ||
597 | /* mark the fs r/w for quota activity */ | ||
598 | sb->s_flags &= ~MS_RDONLY; | ||
599 | dquot_resume(sb, -1); | ||
600 | } | ||
601 | |||
602 | out_unlock: | 594 | out_unlock: |
603 | unlock_kernel(); | 595 | unlock_kernel(); |
604 | return error; | 596 | return error; |
@@ -1948,10 +1940,6 @@ static int udf_fill_super(struct super_block *sb, void *options, int silent) | |||
1948 | /* Fill in the rest of the superblock */ | 1940 | /* Fill in the rest of the superblock */ |
1949 | sb->s_op = &udf_sb_ops; | 1941 | sb->s_op = &udf_sb_ops; |
1950 | sb->s_export_op = &udf_export_ops; | 1942 | sb->s_export_op = &udf_export_ops; |
1951 | #ifdef CONFIG_QUOTA | ||
1952 | sb->s_qcop = &dquot_quotactl_ops; | ||
1953 | sb->dq_op = NULL; /* &dquot_operations */ | ||
1954 | #endif | ||
1955 | 1943 | ||
1956 | sb->s_dirt = 0; | 1944 | sb->s_dirt = 0; |
1957 | sb->s_magic = UDF_SUPER_MAGIC; | 1945 | sb->s_magic = UDF_SUPER_MAGIC; |
@@ -2106,8 +2094,6 @@ static void udf_put_super(struct super_block *sb) | |||
2106 | int i; | 2094 | int i; |
2107 | struct udf_sb_info *sbi; | 2095 | struct udf_sb_info *sbi; |
2108 | 2096 | ||
2109 | dquot_disable(sb, -1, DQUOT_USAGE_ENABLED | DQUOT_LIMITS_ENABLED); | ||
2110 | |||
2111 | sbi = UDF_SB(sb); | 2097 | sbi = UDF_SB(sb); |
2112 | 2098 | ||
2113 | lock_kernel(); | 2099 | lock_kernel(); |