mirror of
https://github.com/versity/scoutfs.git
synced 2026-04-22 22:40:31 +00:00
495358996c
When we added the kernelcompat layer around the old and new readdir interfaces there was some confusion in the old readdir interface filldir arguments. We were passing in our scoutfs dent item struct pointer instead of the filldir callback buf pointer. This prevented readdir from working in older kernels because filldir would immediately see a corrupt buf and return an error. This renames the emit compat macro arguments to make them consistent with the other calls and readdir now provides the correct pointer to the emit wrapper. Signed-off-by: Zach Brown <zab@versity.com>
50 lines
1.4 KiB
C
50 lines
1.4 KiB
C
#ifndef _SCOUTFS_KERNELCOMPAT_H_
|
|
#define _SCOUTFS_KERNELCOMPAT_H_
|
|
|
|
#ifndef KC_ITERATE_DIR_CONTEXT
|
|
#include <linux/fs.h>
|
|
typedef filldir_t kc_readdir_ctx_t;
|
|
#define KC_DECLARE_READDIR(name, file, dirent, ctx) name(file, dirent, ctx)
|
|
#define KC_FOP_READDIR readdir
|
|
#define kc_readdir_pos(filp, ctx) (filp)->f_pos
|
|
#define kc_dir_emit_dots(file, dirent, ctx) dir_emit_dots(file, dirent, ctx)
|
|
#define kc_dir_emit(ctx, dirent, name, name_len, pos, ino, dt) \
|
|
(ctx(dirent, name, name_len, pos, ino, dt) == 0)
|
|
#else
|
|
typedef struct dir_context * kc_readdir_ctx_t;
|
|
#define KC_DECLARE_READDIR(name, file, dirent, ctx) name(file, ctx)
|
|
#define KC_FOP_READDIR iterate
|
|
#define kc_readdir_pos(filp, ctx) (ctx)->pos
|
|
#define kc_dir_emit_dots(file, dirent, ctx) dir_emit_dots(file, ctx)
|
|
#define kc_dir_emit(ctx, dirent, name, name_len, pos, ino, dt) \
|
|
dir_emit(ctx, name, name_len, ino, dt)
|
|
#endif
|
|
|
|
#ifndef KC_DIR_EMIT_DOTS
|
|
/*
|
|
* Kernels before ->iterate and don't have dir_emit_dots so we give them
|
|
* one that works with the ->readdir() filldir() method.
|
|
*/
|
|
static inline int dir_emit_dots(struct file *file, void *dirent,
|
|
filldir_t filldir)
|
|
{
|
|
if (file->f_pos == 0) {
|
|
if (filldir(dirent, ".", 1, 1,
|
|
file->f_path.dentry->d_inode->i_ino, DT_DIR))
|
|
return 0;
|
|
file->f_pos = 1;
|
|
}
|
|
|
|
if (file->f_pos == 1) {
|
|
if (filldir(dirent, "..", 2, 1,
|
|
parent_ino(file->f_path.dentry), DT_DIR))
|
|
return 0;
|
|
file->f_pos = 2;
|
|
}
|
|
|
|
return 1;
|
|
}
|
|
#endif
|
|
|
|
#endif
|