]) # LC_DIRECTIO_USE_ITER
#
+# LC_NFS_FILLDIR_USE_CTX
+#
+# 3.18 kernel moved from void cookie to struct dir_context
+#
+AC_DEFUN([LC_NFS_FILLDIR_USE_CTX], [
+tmp_flags="$EXTRA_KCFLAGS"
+EXTRA_KCFLAGS="-Werror"
+LB_CHECK_COMPILE([if filldir_t uses struct dir_context],
+filldir_ctx, [
+ #include <linux/fs.h>
+],[
+ int filldir(struct dir_context *ctx, const char* name,
+ int i, loff_t off, u64 tmp, unsigned temp)
+ {
+ return 0;
+ }
+
+ struct dir_context ctx = {
+ .actor = filldir,
+ };
+
+ ctx.actor(NULL, "test", 0, (loff_t) 0, 0, 0);
+],[
+ AC_DEFINE(HAVE_FILLDIR_USE_CTX, 1,
+ [filldir_t needs struct dir_context as argument])
+])
+EXTRA_KCFLAGS="$tmp_flags"
+]) # LC_NFS_FILLDIR_USE_CTX
+
+#
# LC_KIOCB_HAS_NBYTES
#
# 3.19 kernel removed ki_nbytes from struct kiocb
# 3.16
LC_DIRECTIO_USE_ITER
+ # 3.18
+ LC_NFS_FILLDIR_USE_CTX
+
# 3.19
LC_KIOCB_HAS_NBYTES
RETURN(FILEID_LUSTRE);
}
-static int ll_nfs_get_name_filldir(void *cookie, const char *name, int namelen,
- loff_t hash, u64 ino, unsigned type)
+static int
+#ifndef HAVE_FILLDIR_USE_CTX
+ll_nfs_get_name_filldir(void *cookie, const char *name, int namelen,
+ loff_t hash, u64 ino, unsigned type)
{
+ struct ll_getname_data *lgd = cookie;
+#else
+ll_nfs_get_name_filldir(struct dir_context *ctx, const char *name, int namelen,
+ loff_t hash, u64 ino, unsigned type)
+{
+ struct ll_getname_data *lgd =
+ container_of(ctx, struct ll_getname_data, ctx);
+#endif /* HAVE_FILLDIR_USE_CTX */
/* It is hack to access lde_fid for comparison with lgd_fid.
* So the input 'name' must be part of the 'lu_dirent'. */
struct lu_dirent *lde = container_of0(name, struct lu_dirent, lde_name);
- struct ll_getname_data *lgd = cookie;
struct lu_fid fid;
fid_le_to_cpu(&fid, &lde->lde_fid);