Merge tag 'upstream-4.9-rc3' of git://git.infradead.org/linux-ubifs (efa56375) · Commits · 戴 / test

Pull ubi/ubifs fixes from Richard Weinberger: "This contains fixes for issues in both UBI and UBIFS: - A regression wrt overlayfs, introduced in -rc2. - An UBI issue, found by Dan Carpenter's static checker" * tag 'upstream-4.9-rc3' of git://git.infradead.org/linux-ubifs: ubifs: Fix regression in ubifs_readdir() ubi: fastmap: Fix add_vol() return value test in ubi_attach_fastmap()

drivers/mtd/ubi/fastmap.c

+5 −5

Original line number	Diff line number	Diff line
		@@ -707,11 +707,11 @@ static int ubi_attach_fastmap(struct ubi_device *ubi,
		fmvhdr->vol_type,
		be32_to_cpu(fmvhdr->last_eb_bytes));

		if (!av)
		goto fail_bad;
		if (PTR_ERR(av) == -EINVAL) {
		if (IS_ERR(av)) {
		if (PTR_ERR(av) == -EEXIST)
		ubi_err(ubi, "volume (ID %i) already exists",
		fmvhdr->vol_id);

		goto fail_bad;
		}

fs/ubifs/dir.c

+8 −0

Original line number	Diff line number	Diff line
		@@ -543,6 +543,14 @@ out:

		if (err != -ENOENT)
		ubifs_err(c, "cannot find next direntry, error %d", err);
		else
		/*
		* -ENOENT is a non-fatal error in this context, the TNC uses
		* it to indicate that the cursor moved past the current directory
		* and readdir() has to stop.
		*/
		err = 0;


		/* 2 is a special value indicating that there are no more direntries */
		ctx->pos = 2;

Admin message