Merge tag 'upstream-4.9-rc3' of git://git.infradead.org/linux-ubifs

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()

1 files changed, 8 insertions, 0 deletions

diff --git a/fs/ubifs/dir.c b/fs/ubifs/dir.c
index bd4a5e8ce441..ca16c5d7bab1 100644
--- a/fs/ubifs/dir.c
+++ b/fs/ubifs/dir.c
@@ -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;