diff options
Diffstat (limited to 'fs/ubifs/dir.c')
| -rw-r--r-- | fs/ubifs/dir.c | 21 |
1 files changed, 14 insertions, 7 deletions
diff --git a/fs/ubifs/dir.c b/fs/ubifs/dir.c index 27060fc855d4..e0af247f4740 100644 --- a/fs/ubifs/dir.c +++ b/fs/ubifs/dir.c @@ -350,7 +350,7 @@ static unsigned int vfs_dent_type(uint8_t type) */ static int ubifs_readdir(struct file *file, struct dir_context *ctx) { - int err; + int err = 0; struct qstr nm; union ubifs_key key; struct ubifs_dent_node *dent; @@ -449,16 +449,23 @@ static int ubifs_readdir(struct file *file, struct dir_context *ctx) } out: - if (err != -ENOENT) { - ubifs_err(c, "cannot find next direntry, error %d", err); - return err; - } - kfree(file->private_data); file->private_data = NULL; + + 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; - return 0; + return err; } /* Free saved readdir() state when the directory is closed */ |