#ifdef HAVE_BVEC_ITER
#define bio_idx(bio) (bio->bi_iter.bi_idx)
#define bio_set_sector(bio, sector) (bio->bi_iter.bi_sector = sector)
-#define bvl_to_page(bvl) (bvl.bv_page)
+#define bvl_to_page(bvl) (bvl->bv_page)
#else
#define bio_idx(bio) (bio->bi_idx)
#define bio_set_sector(bio, sector) (bio->bi_sector = sector)
#endif
#endif
+#ifdef HAVE_PID_NS_FOR_CHILDREN
+# define ll_task_pid_ns(task) ((task)->nsproxy->pid_ns_for_children)
+#else
+# define ll_task_pid_ns(task) ((task)->nsproxy->pid_ns)
+#endif
+
#endif /* _LUSTRE_COMPAT_H */