/* LUSTRE_OSD_NAME */
#include <obd.h>
-/* class_register_type(), class_unregister_type(), class_get_type() */
+/* class_register_type(), class_unregister_type() */
#include <obd_class.h>
#include <lustre_disk.h>
#include <dt_object.h>
extern int ldiskfs_pdo;
+#ifdef HAVE_BVEC_ITER_ALL
+#define DECLARE_BVEC_ITER_ALL(iter) struct bvec_iter_all iter
+#else
+#define DECLARE_BVEC_ITER_ALL(iter) int iter
+#endif
+
#ifndef HAVE_VFS_SETXATTR
#define osd_setxattr(dentry, inode, name, buf, len, flag) \
((inode)->i_op->setxattr(dentry, name, buf, len, flag))
struct osd_inode_id *id);
void osd_scrub_dump(struct seq_file *m, struct osd_device *dev);
-struct dentry *osd_lookup_one_len_unlocked(const char *name,
+struct dentry *osd_lookup_one_len_unlocked(struct osd_device *dev,
+ const char *name,
struct dentry *base, int len);
-struct dentry *osd_ios_lookup_one_len(const char *name, struct dentry *base,
- int len);
+struct dentry *osd_lookup_one_len(struct osd_device *dev, const char *name,
+ struct dentry *base, int len);
int osd_fld_lookup(const struct lu_env *env, struct osd_device *osd,
u64 seq, struct lu_seq_range *range);
ldiskfs_journal_start(inode, type, nblocks)
# define osd_transaction_size(dev) \
(osd_journal(dev)->j_max_transaction_buffers / 2)
-#else
+#else /* ! defined LDISKFS_HT_MISC */
# define LDISKFS_HT_MISC 0
# define osd_journal_start_sb(sb, type, nblock) \
ldiskfs_journal_start_sb(sb, nblock)
}
#endif
+#ifdef HAVE_BIO_BI_PHYS_SEGMENTS
+#define osd_bio_nr_segs(bio) ((bio)->bi_phys_segments)
+#else
+#define osd_bio_nr_segs(bio) bio_segments((bio))
+#endif /* HAVE_BIO_BI_PHYS_SEGMENTS */
+
#endif /* _OSD_INTERNAL_H */