diff options
| author | Jan Kara <jack@suse.cz> | 2010-05-19 16:28:56 +0200 |
|---|---|---|
| committer | Jan Kara <jack@suse.cz> | 2010-05-24 14:10:19 +0200 |
| commit | 36350462814739e1f38cba59a6900ebadb08d3bb (patch) | |
| tree | 09c1f17c5a264a50028a1ea25f3fd681734d2058 /fs/udf/super.c | |
| parent | 287a80958cf63fc5c68d5bf6e89a3669dd66234a (diff) | |
| download | linux-3.10-36350462814739e1f38cba59a6900ebadb08d3bb.tar.gz linux-3.10-36350462814739e1f38cba59a6900ebadb08d3bb.tar.bz2 linux-3.10-36350462814739e1f38cba59a6900ebadb08d3bb.zip | |
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 5e03592369d..612d1e2e285 100644 --- a/fs/udf/super.c +++ b/fs/udf/super.c @@ -54,7 +54,6 @@ #include <linux/vmalloc.h> #include <linux/errno.h> #include <linux/mount.h> -#include <linux/quotaops.h> #include <linux/seq_file.h> #include <linux/bitmap.h> #include <linux/crc-itu-t.h> @@ -587,18 +586,11 @@ static int udf_remount_fs(struct super_block *sb, int *flags, char *options) if ((*flags & MS_RDONLY) == (sb->s_flags & MS_RDONLY)) goto out_unlock; - if (*flags & MS_RDONLY) { + if (*flags & MS_RDONLY) udf_close_lvid(sb); - - error = dquot_suspend(sb, -1); - } else { + else udf_open_lvid(sb); - /* mark the fs r/w for quota activity */ - sb->s_flags &= ~MS_RDONLY; - dquot_resume(sb, -1); - } - out_unlock: unlock_kernel(); return error; @@ -1948,10 +1940,6 @@ static int udf_fill_super(struct super_block *sb, void *options, int silent) /* Fill in the rest of the superblock */ sb->s_op = &udf_sb_ops; sb->s_export_op = &udf_export_ops; -#ifdef CONFIG_QUOTA - sb->s_qcop = &dquot_quotactl_ops; - sb->dq_op = NULL; /* &dquot_operations */ -#endif sb->s_dirt = 0; sb->s_magic = UDF_SUPER_MAGIC; @@ -2106,8 +2094,6 @@ static void udf_put_super(struct super_block *sb) int i; struct udf_sb_info *sbi; - dquot_disable(sb, -1, DQUOT_USAGE_ENABLED | DQUOT_LIMITS_ENABLED); - sbi = UDF_SB(sb); lock_kernel(); |