Commit 094b6d12 authored by Zhihao Cheng's avatar Zhihao Cheng Committed by Richard Weinberger
Browse files

ubifs: Fix wrong orphan node deletion in ubifs_jnl_update|rename 



There a wrong orphan node deleting in error handling path in
ubifs_jnl_update() and ubifs_jnl_rename(), which may cause
following error msg:

  UBIFS error (ubi0:0 pid 1522): ubifs_delete_orphan [ubifs]:
  missing orphan ino 65

Fix this by checking whether the node has been operated for
adding to orphan list before being deleted,

Signed-off-by: default avatarZhihao Cheng <chengzhihao1@huawei.com>
Fixes: 823838a4 ("ubifs: Add hashes to the tree node cache")
Signed-off-by: default avatarRichard Weinberger <richard@nod.at>
parent c3fc1a39

fs/ubifs/journal.c

+6 −4
Original line number Diff line number Diff line
@@ -539,7 +539,7 @@ int ubifs_jnl_update(struct ubifs_info *c, const struct inode *dir, 
		     const struct fscrypt_name *nm, const struct inode *inode,

		     int deletion, int xent)

{

	int err, dlen, ilen, len, lnum, ino_offs, dent_offs;

	int err, dlen, ilen, len, lnum, ino_offs, dent_offs, orphan_added = 0;

	int aligned_dlen, aligned_ilen, sync = IS_DIRSYNC(dir);

	int last_reference = !!(deletion && inode->i_nlink == 0);

	struct ubifs_inode *ui = ubifs_inode(inode);
@@ -630,6 +630,7 @@ int ubifs_jnl_update(struct ubifs_info *c, const struct inode *dir, 
			goto out_finish;

		}

		ui->del_cmtno = c->cmt_no;

		orphan_added = 1;

	}



	err = write_head(c, BASEHD, dent, len, &lnum, &dent_offs, sync);
@@ -702,7 +703,7 @@ out_release: 
	kfree(dent);

out_ro:

	ubifs_ro_mode(c, err);

	if (last_reference)

	if (orphan_added)

		ubifs_delete_orphan(c, inode->i_ino);

	finish_reservation(c);

	return err;
@@ -1218,7 +1219,7 @@ int ubifs_jnl_rename(struct ubifs_info *c, const struct inode *old_dir, 
	void *p;

	union ubifs_key key;

	struct ubifs_dent_node *dent, *dent2;

	int err, dlen1, dlen2, ilen, lnum, offs, len;

	int err, dlen1, dlen2, ilen, lnum, offs, len, orphan_added = 0;

	int aligned_dlen1, aligned_dlen2, plen = UBIFS_INO_NODE_SZ;

	int last_reference = !!(new_inode && new_inode->i_nlink == 0);

	int move = (old_dir != new_dir);
@@ -1334,6 +1335,7 @@ int ubifs_jnl_rename(struct ubifs_info *c, const struct inode *old_dir, 
			goto out_finish;

		}

		new_ui->del_cmtno = c->cmt_no;

		orphan_added = 1;

	}



	err = write_head(c, BASEHD, dent, len, &lnum, &offs, sync);
@@ -1415,7 +1417,7 @@ out_release: 
	release_head(c, BASEHD);

out_ro:

	ubifs_ro_mode(c, err);

	if (last_reference)

	if (orphan_added)

		ubifs_delete_orphan(c, new_inode->i_ino);

out_finish:

	finish_reservation(c);

CRA Git | Maintained and supported by SUSTech CRA and CCSE