projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'r6040' of git://git.kernel.org/pub/scm/linux/kernel/git/romieu/netdev...
[firefly-linux-kernel-4.4.55.git]
/
fs
/
super.c
diff --git
a/fs/super.c
b/fs/super.c
index ceaf2e3d594cdd89afabab0253cf1ab59badceba..88811f60c8de517829ce7828c1971bfb4f90d8a1 100644
(file)
--- a/
fs/super.c
+++ b/
fs/super.c
@@
-105,6
+105,7
@@
static inline void destroy_super(struct super_block *s)
{
security_sb_free(s);
kfree(s->s_subtype);
+ kfree(s->s_options);
kfree(s);
}
@@
-603,6
+604,7
@@
int do_remount_sb(struct super_block *sb, int flags, void *data, int force)
mark_files_ro(sb);
else if (!fs_may_remount_ro(sb))
return -EBUSY;
+ DQUOT_OFF(sb);
}
if (sb->s_op->remount_fs) {