renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-11-20 16:46:23 +08:00
Code

UBIFS: ensure orphan area head is initialized

Browse Source 
When mounting read-only the orphan area head is
not initialized.  It must be initialized when
remounting read/write, but it was not.  This patch
fixes that.

[Artem: sorry, added comment tweaking noise]
Signed-off-by: Adrian Hunter <ext-adrian.hunter@nokia.com>
Signed-off-by: Artem Bityutskiy <Artem.Bityutskiy@nokia.com>
This commit is contained in:
Adrian Hunter 2009-01-26 10:55:40 +02:00 committed by Artem Bityutskiy
parent b4978e9491
commit 49d128aa60
3 changed files with 26 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
fs/ubifs/orphan.c
View File

@ -46,7 +46,7 @@
* Orphans are accumulated in a rb-tree. When an inode's link count drops to * Orphans are accumulated in a rb-tree. When an inode's link count drops to
* zero, the inode number is added to the rb-tree. It is removed from the tree * zero, the inode number is added to the rb-tree. It is removed from the tree
* when the inode is deleted. Any new orphans that are in the orphan tree when * when the inode is deleted. Any new orphans that are in the orphan tree when
* the commit is run, are written to the orphan area in 1 or more orph nodes. * the commit is run, are written to the orphan area in 1 or more orphan nodes.
* If the orphan area is full, it is consolidated to make space. There is * If the orphan area is full, it is consolidated to make space. There is
* always enough space because validation prevents the user from creating more * always enough space because validation prevents the user from creating more
* than the maximum number of orphans allowed. * than the maximum number of orphans allowed.
@ -231,7 +231,7 @@ static int tot_avail_orphs(struct ubifs_info *c)
} }
/** /**
* do_write_orph_node - write a node * do_write_orph_node - write a node to the orphan head.
* @c: UBIFS file-system description object * @c: UBIFS file-system description object
* @len: length of node * @len: length of node
* @atomic: write atomically * @atomic: write atomically
@ -264,11 +264,11 @@ static int do_write_orph_node(struct ubifs_info *c, int len, int atomic)
} }
/** /**
* write_orph_node - write an orph node * write_orph_node - write an orphan node.
* @c: UBIFS file-system description object * @c: UBIFS file-system description object
* @atomic: write atomically * @atomic: write atomically
* *
* This function builds an orph node from the cnext list and writes it to the * This function builds an orphan node from the cnext list and writes it to the
* orphan head. On success, %0 is returned, otherwise a negative error code * orphan head. On success, %0 is returned, otherwise a negative error code
* is returned. * is returned.
*/ */
@ -326,11 +326,11 @@ static int write_orph_node(struct ubifs_info *c, int atomic)
} }
/** /**
* write_orph_nodes - write orph nodes until there are no more to commit * write_orph_nodes - write orphan nodes until there are no more to commit.
* @c: UBIFS file-system description object * @c: UBIFS file-system description object
* @atomic: write atomically * @atomic: write atomically
* *
* This function writes orph nodes for all the orphans to commit. On success, * This function writes orphan nodes for all the orphans to commit. On success,
* %0 is returned, otherwise a negative error code is returned. * %0 is returned, otherwise a negative error code is returned.
*/ */
static int write_orph_nodes(struct ubifs_info *c, int atomic) static int write_orph_nodes(struct ubifs_info *c, int atomic)
@ -478,14 +478,14 @@ int ubifs_orphan_end_commit(struct ubifs_info *c)
} }
/** /**
* clear_orphans - erase all LEBs used for orphans. * ubifs_clear_orphans - erase all LEBs used for orphans.
* @c: UBIFS file-system description object * @c: UBIFS file-system description object
* *
* If recovery is not required, then the orphans from the previous session * If recovery is not required, then the orphans from the previous session
* are not needed. This function locates the LEBs used to record * are not needed. This function locates the LEBs used to record
* orphans, and un-maps them. * orphans, and un-maps them.
*/ */
static int clear_orphans(struct ubifs_info *c) int ubifs_clear_orphans(struct ubifs_info *c)
{ {
int lnum, err; int lnum, err;
@ -547,9 +547,9 @@ static int insert_dead_orphan(struct ubifs_info *c, ino_t inum)
* do_kill_orphans - remove orphan inodes from the index. * do_kill_orphans - remove orphan inodes from the index.
* @c: UBIFS file-system description object * @c: UBIFS file-system description object
* @sleb: scanned LEB * @sleb: scanned LEB
* @last_cmt_no: cmt_no of last orph node read is passed and returned here * @last_cmt_no: cmt_no of last orphan node read is passed and returned here
* @outofdate: whether the LEB is out of date is returned here * @outofdate: whether the LEB is out of date is returned here
* @last_flagged: whether the end orph node is encountered * @last_flagged: whether the end orphan node is encountered
* *
* This function is a helper to the 'kill_orphans()' function. It goes through * This function is a helper to the 'kill_orphans()' function. It goes through
* every orphan node in a LEB and for every inode number recorded, removes * every orphan node in a LEB and for every inode number recorded, removes
@ -580,8 +580,8 @@ static int do_kill_orphans(struct ubifs_info *c, struct ubifs_scan_leb *sleb,
/* /*
* The commit number on the master node may be less, because * The commit number on the master node may be less, because
* of a failed commit. If there are several failed commits in a * of a failed commit. If there are several failed commits in a
* row, the commit number written on orph nodes will continue to * row, the commit number written on orphan nodes will continue
* increase (because the commit number is adjusted here) even * to increase (because the commit number is adjusted here) even
* though the commit number on the master node stays the same * though the commit number on the master node stays the same
* because the master node has not been re-written. * because the master node has not been re-written.
*/ */
@ -589,9 +589,9 @@ static int do_kill_orphans(struct ubifs_info *c, struct ubifs_scan_leb *sleb,
c->cmt_no = cmt_no; c->cmt_no = cmt_no;
if (cmt_no < *last_cmt_no && *last_flagged) { if (cmt_no < *last_cmt_no && *last_flagged) {
/* /*
* The last orph node had a higher commit number and was * The last orphan node had a higher commit number and
* flagged as the last written for that commit number. * was flagged as the last written for that commit
* That makes this orph node, out of date. * number. That makes this orphan node, out of date.
*/ */
if (!first) { if (!first) {
ubifs_err("out of order commit number %llu in " ubifs_err("out of order commit number %llu in "
@ -658,10 +658,10 @@ static int kill_orphans(struct ubifs_info *c)
/* /*
* Orph nodes always start at c->orph_first and are written to each * Orph nodes always start at c->orph_first and are written to each
* successive LEB in turn. Generally unused LEBs will have been unmapped * successive LEB in turn. Generally unused LEBs will have been unmapped
* but may contain out of date orph nodes if the unmap didn't go * but may contain out of date orphan nodes if the unmap didn't go
* through. In addition, the last orph node written for each commit is * through. In addition, the last orphan node written for each commit is
* marked (top bit of orph->cmt_no is set to 1). It is possible that * marked (top bit of orph->cmt_no is set to 1). It is possible that
* there are orph nodes from the next commit (i.e. the commit did not * there are orphan nodes from the next commit (i.e. the commit did not
* complete successfully). In that case, no orphans will have been lost * complete successfully). In that case, no orphans will have been lost
* due to the way that orphans are written, and any orphans added will * due to the way that orphans are written, and any orphans added will
* be valid orphans anyway and so can be deleted. * be valid orphans anyway and so can be deleted.
@ -718,7 +718,7 @@ int ubifs_mount_orphans(struct ubifs_info *c, int unclean, int read_only)
if (unclean) if (unclean)
err = kill_orphans(c); err = kill_orphans(c);
else if (!read_only) else if (!read_only)
err = clear_orphans(c); err = ubifs_clear_orphans(c);
return err; return err;
} }

6
fs/ubifs/super.c
View File

@ -1524,6 +1524,12 @@ static int ubifs_remount_rw(struct ubifs_info *c)
err = ubifs_recover_inl_heads(c, c->sbuf); err = ubifs_recover_inl_heads(c, c->sbuf);
if (err) if (err)
goto out; goto out;
} else {
/* A readonly mount is not allowed to have orphans */
ubifs_assert(c->tot_orphans == 0);
err = ubifs_clear_orphans(c);
if (err)
goto out;
} }
if (!(c->mst_node->flags & cpu_to_le32(UBIFS_MST_DIRTY))) { if (!(c->mst_node->flags & cpu_to_le32(UBIFS_MST_DIRTY))) {

1
fs/ubifs/ubifs.h
View File

@ -1604,6 +1604,7 @@ void ubifs_delete_orphan(struct ubifs_info *c, ino_t inum);
int ubifs_orphan_start_commit(struct ubifs_info *c); int ubifs_orphan_start_commit(struct ubifs_info *c);
int ubifs_orphan_end_commit(struct ubifs_info *c); int ubifs_orphan_end_commit(struct ubifs_info *c);
int ubifs_mount_orphans(struct ubifs_info *c, int unclean, int read_only); int ubifs_mount_orphans(struct ubifs_info *c, int unclean, int read_only);
int ubifs_clear_orphans(struct ubifs_info *c);
/* lpt.c */ /* lpt.c */
int ubifs_calc_lpt_geom(struct ubifs_info *c); int ubifs_calc_lpt_geom(struct ubifs_info *c);