mirror of
https://mirrors.bfsu.edu.cn/git/linux.git
synced 2024-11-11 12:28:41 +08:00
[readdir] convert jffs2
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
This commit is contained in:
parent
6f7f231e7b
commit
0312fa7ccd
@ -22,7 +22,7 @@
|
||||
#include <linux/time.h>
|
||||
#include "nodelist.h"
|
||||
|
||||
static int jffs2_readdir (struct file *, void *, filldir_t);
|
||||
static int jffs2_readdir (struct file *, struct dir_context *);
|
||||
|
||||
static int jffs2_create (struct inode *,struct dentry *,umode_t,
|
||||
bool);
|
||||
@ -40,7 +40,7 @@ static int jffs2_rename (struct inode *, struct dentry *,
|
||||
const struct file_operations jffs2_dir_operations =
|
||||
{
|
||||
.read = generic_read_dir,
|
||||
.readdir = jffs2_readdir,
|
||||
.iterate = jffs2_readdir,
|
||||
.unlocked_ioctl=jffs2_ioctl,
|
||||
.fsync = jffs2_fsync,
|
||||
.llseek = generic_file_llseek,
|
||||
@ -114,60 +114,40 @@ static struct dentry *jffs2_lookup(struct inode *dir_i, struct dentry *target,
|
||||
/***********************************************************************/
|
||||
|
||||
|
||||
static int jffs2_readdir(struct file *filp, void *dirent, filldir_t filldir)
|
||||
static int jffs2_readdir(struct file *file, struct dir_context *ctx)
|
||||
{
|
||||
struct jffs2_inode_info *f;
|
||||
struct inode *inode = file_inode(filp);
|
||||
struct inode *inode = file_inode(file);
|
||||
struct jffs2_inode_info *f = JFFS2_INODE_INFO(inode);
|
||||
struct jffs2_full_dirent *fd;
|
||||
unsigned long offset, curofs;
|
||||
unsigned long curofs = 1;
|
||||
|
||||
jffs2_dbg(1, "jffs2_readdir() for dir_i #%lu\n",
|
||||
file_inode(filp)->i_ino);
|
||||
jffs2_dbg(1, "jffs2_readdir() for dir_i #%lu\n", inode->i_ino);
|
||||
|
||||
f = JFFS2_INODE_INFO(inode);
|
||||
if (!dir_emit_dots(file, ctx))
|
||||
return 0;
|
||||
|
||||
offset = filp->f_pos;
|
||||
|
||||
if (offset == 0) {
|
||||
jffs2_dbg(1, "Dirent 0: \".\", ino #%lu\n", inode->i_ino);
|
||||
if (filldir(dirent, ".", 1, 0, inode->i_ino, DT_DIR) < 0)
|
||||
goto out;
|
||||
offset++;
|
||||
}
|
||||
if (offset == 1) {
|
||||
unsigned long pino = parent_ino(filp->f_path.dentry);
|
||||
jffs2_dbg(1, "Dirent 1: \"..\", ino #%lu\n", pino);
|
||||
if (filldir(dirent, "..", 2, 1, pino, DT_DIR) < 0)
|
||||
goto out;
|
||||
offset++;
|
||||
}
|
||||
|
||||
curofs=1;
|
||||
mutex_lock(&f->sem);
|
||||
for (fd = f->dents; fd; fd = fd->next) {
|
||||
|
||||
curofs++;
|
||||
/* First loop: curofs = 2; offset = 2 */
|
||||
if (curofs < offset) {
|
||||
/* First loop: curofs = 2; pos = 2 */
|
||||
if (curofs < ctx->pos) {
|
||||
jffs2_dbg(2, "Skipping dirent: \"%s\", ino #%u, type %d, because curofs %ld < offset %ld\n",
|
||||
fd->name, fd->ino, fd->type, curofs, offset);
|
||||
fd->name, fd->ino, fd->type, curofs, (unsigned long)ctx->pos);
|
||||
continue;
|
||||
}
|
||||
if (!fd->ino) {
|
||||
jffs2_dbg(2, "Skipping deletion dirent \"%s\"\n",
|
||||
fd->name);
|
||||
offset++;
|
||||
ctx->pos++;
|
||||
continue;
|
||||
}
|
||||
jffs2_dbg(2, "Dirent %ld: \"%s\", ino #%u, type %d\n",
|
||||
offset, fd->name, fd->ino, fd->type);
|
||||
if (filldir(dirent, fd->name, strlen(fd->name), offset, fd->ino, fd->type) < 0)
|
||||
(unsigned long)ctx->pos, fd->name, fd->ino, fd->type);
|
||||
if (!dir_emit(ctx, fd->name, strlen(fd->name), fd->ino, fd->type))
|
||||
break;
|
||||
offset++;
|
||||
ctx->pos++;
|
||||
}
|
||||
mutex_unlock(&f->sem);
|
||||
out:
|
||||
filp->f_pos = offset;
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user