evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

UBIFS: allow mounting when short of space

Browse source 
It is fine if there is not free space - we should still allow mounting
this FS. This patch relaxes the free space requirements and adds info
dumps.

Signed-off-by: Artem Bityutskiy <Artem.Bityutskiy@nokia.com>
This commit is contained in:
Artem Bityutskiy 2008-12-30 16:23:34 +02:00
parent a9f2fc0e25
commit 57a450e959
1 changed files with 29 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
fs/ubifs/super.c
View file

@ -1073,6 +1073,30 @@ again:
} }
} }
/**
* check_free_space - check if there is enough free space to mount.
* @c: UBIFS file-system description object
*
* This function makes sure UBIFS has enough free space to be mounted in
* read/write mode. UBIFS must always have some free space to allow deletions.
*/
static int check_free_space(struct ubifs_info *c)
{
ubifs_assert(c->dark_wm > 0);
if (c->lst.total_free + c->lst.total_dirty < c->dark_wm) {
ubifs_err("insufficient free space to mount in read/write mode");
dbg_dump_budg(c);
dbg_dump_lprops(c);
/*
* We return %-EINVAL instead of %-ENOSPC because it seems to
* be the closest error code mentioned in the mount function
* documentation.
*/
return -EINVAL;
}
return 0;
}
/** /**
* mount_ubifs - mount UBIFS file-system. * mount_ubifs - mount UBIFS file-system.
* @c: UBIFS file-system description object * @c: UBIFS file-system description object
@ -1154,7 +1178,7 @@ static int mount_ubifs(struct ubifs_info *c)
/* /*
* Make sure the compressor which is set as default in the superblock * Make sure the compressor which is set as default in the superblock
* or overriden by mount options is actually compiled in. * or overridden by mount options is actually compiled in.
*/ */
if (!ubifs_compr_present(c->default_compr)) { if (!ubifs_compr_present(c->default_compr)) {
ubifs_err("'compressor \"%s\" is not compiled in", ubifs_err("'compressor \"%s\" is not compiled in",
@ -1236,12 +1260,9 @@ static int mount_ubifs(struct ubifs_info *c)
if (!mounted_read_only) { if (!mounted_read_only) {
int lnum; int lnum;
/* Check for enough free space */ err = check_free_space(c);
if (ubifs_calc_available(c, c->min_idx_lebs) <= 0) { if (err)
ubifs_err("insufficient available space");
err = -EINVAL;
goto out_orphans; goto out_orphans;
}
/* Check for enough log space */ /* Check for enough log space */
lnum = c->lhead_lnum + 1; lnum = c->lhead_lnum + 1;
@ -1442,12 +1463,9 @@ static int ubifs_remount_rw(struct ubifs_info *c)
c->remounting_rw = 1; c->remounting_rw = 1;
c->always_chk_crc = 1; c->always_chk_crc = 1;
/* Check for enough free space */ err = check_free_space(c);
if (ubifs_calc_available(c, c->min_idx_lebs) <= 0) { if (err)
ubifs_err("insufficient available space");
err = -EINVAL;
goto out; goto out;
}
if (c->old_leb_cnt != c->leb_cnt) { if (c->old_leb_cnt != c->leb_cnt) {
struct ubifs_sb_node *sup; struct ubifs_sb_node *sup;