Commit e0ccfd95 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Jan Kara

quota: move unmount handling into the filesystem

Currently the VFS calls into the quotactl interface for unmounting
filesystems.  This means filesystems with their own quota handling
can't easily distinguish between user-space originating quotaoff
and an unount.  Instead move the responsibily of the unmount handling
into the filesystem to be consistent with all other dquot handling.

Note that we do call dquot_disable a lot later now, e.g. after
a sync_filesystem.  But this is fine as the quota code does all its
writes via blockdev's mapping and that is synced even later.
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarJan Kara <jack@suse.cz>
parent 0f0dd62f
...@@ -119,6 +119,8 @@ static void ext2_put_super (struct super_block * sb) ...@@ -119,6 +119,8 @@ static void ext2_put_super (struct super_block * sb)
int i; int i;
struct ext2_sb_info *sbi = EXT2_SB(sb); struct ext2_sb_info *sbi = EXT2_SB(sb);
dquot_disable(sb, -1, DQUOT_USAGE_ENABLED | DQUOT_LIMITS_ENABLED);
if (sb->s_dirt) if (sb->s_dirt)
ext2_write_super(sb); ext2_write_super(sb);
......
...@@ -410,6 +410,8 @@ static void ext3_put_super (struct super_block * sb) ...@@ -410,6 +410,8 @@ static void ext3_put_super (struct super_block * sb)
struct ext3_super_block *es = sbi->s_es; struct ext3_super_block *es = sbi->s_es;
int i, err; int i, err;
dquot_disable(sb, -1, DQUOT_USAGE_ENABLED | DQUOT_LIMITS_ENABLED);
lock_kernel(); lock_kernel();
ext3_xattr_put_super(sb); ext3_xattr_put_super(sb);
......
...@@ -645,6 +645,8 @@ static void ext4_put_super(struct super_block *sb) ...@@ -645,6 +645,8 @@ static void ext4_put_super(struct super_block *sb)
struct ext4_super_block *es = sbi->s_es; struct ext4_super_block *es = sbi->s_es;
int i, err; int i, err;
dquot_disable(sb, -1, DQUOT_USAGE_ENABLED | DQUOT_LIMITS_ENABLED);
flush_workqueue(sbi->dio_unwritten_wq); flush_workqueue(sbi->dio_unwritten_wq);
destroy_workqueue(sbi->dio_unwritten_wq); destroy_workqueue(sbi->dio_unwritten_wq);
......
...@@ -179,6 +179,8 @@ static void jfs_put_super(struct super_block *sb) ...@@ -179,6 +179,8 @@ static void jfs_put_super(struct super_block *sb)
jfs_info("In jfs_put_super"); jfs_info("In jfs_put_super");
dquot_disable(sb, -1, DQUOT_USAGE_ENABLED | DQUOT_LIMITS_ENABLED);
lock_kernel(); lock_kernel();
rc = jfs_umount(sb); rc = jfs_umount(sb);
......
...@@ -466,6 +466,8 @@ static void reiserfs_put_super(struct super_block *s) ...@@ -466,6 +466,8 @@ static void reiserfs_put_super(struct super_block *s)
struct reiserfs_transaction_handle th; struct reiserfs_transaction_handle th;
th.t_trans_id = 0; th.t_trans_id = 0;
dquot_disable(s, -1, DQUOT_USAGE_ENABLED | DQUOT_LIMITS_ENABLED);
reiserfs_write_lock(s); reiserfs_write_lock(s);
if (s->s_dirt) if (s->s_dirt)
......
...@@ -160,7 +160,6 @@ void deactivate_locked_super(struct super_block *s) ...@@ -160,7 +160,6 @@ void deactivate_locked_super(struct super_block *s)
{ {
struct file_system_type *fs = s->s_type; struct file_system_type *fs = s->s_type;
if (atomic_dec_and_test(&s->s_active)) { if (atomic_dec_and_test(&s->s_active)) {
vfs_dq_off(s, 0);
fs->kill_sb(s); fs->kill_sb(s);
put_filesystem(fs); put_filesystem(fs);
put_super(s); put_super(s);
......
...@@ -2102,6 +2102,8 @@ static void udf_put_super(struct super_block *sb) ...@@ -2102,6 +2102,8 @@ static void udf_put_super(struct super_block *sb)
int i; int i;
struct udf_sb_info *sbi; struct udf_sb_info *sbi;
dquot_disable(sb, -1, DQUOT_USAGE_ENABLED | DQUOT_LIMITS_ENABLED);
sbi = UDF_SB(sb); sbi = UDF_SB(sb);
lock_kernel(); lock_kernel();
......
...@@ -1227,6 +1227,8 @@ static void ufs_put_super(struct super_block *sb) ...@@ -1227,6 +1227,8 @@ static void ufs_put_super(struct super_block *sb)
UFSD("ENTER\n"); UFSD("ENTER\n");
dquot_disable(sb, -1, DQUOT_USAGE_ENABLED | DQUOT_LIMITS_ENABLED);
if (sb->s_dirt) if (sb->s_dirt)
ufs_write_super(sb); ufs_write_super(sb);
......
...@@ -156,16 +156,6 @@ extern const struct quotactl_ops vfs_quotactl_ops; ...@@ -156,16 +156,6 @@ extern const struct quotactl_ops vfs_quotactl_ops;
#define sb_dquot_ops (&dquot_operations) #define sb_dquot_ops (&dquot_operations)
#define sb_quotactl_ops (&vfs_quotactl_ops) #define sb_quotactl_ops (&vfs_quotactl_ops)
/* Cannot be called inside a transaction */
static inline int vfs_dq_off(struct super_block *sb, int remount)
{
int ret = -ENOSYS;
if (sb->s_qcop && sb->s_qcop->quota_off)
ret = sb->s_qcop->quota_off(sb, -1, remount);
return ret;
}
#else #else
static inline int sb_has_quota_usage_enabled(struct super_block *sb, int type) static inline int sb_has_quota_usage_enabled(struct super_block *sb, int type)
...@@ -232,11 +222,6 @@ static inline void dquot_free_inode(const struct inode *inode) ...@@ -232,11 +222,6 @@ static inline void dquot_free_inode(const struct inode *inode)
{ {
} }
static inline int vfs_dq_off(struct super_block *sb, int remount)
{
return 0;
}
static inline int dquot_transfer(struct inode *inode, struct iattr *iattr) static inline int dquot_transfer(struct inode *inode, struct iattr *iattr)
{ {
return 0; return 0;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment