LU-12137 osd-ldiskfs: create locked and unlocked versions of osd lookup code

[fs/lustre-release.git] / lustre / osd-ldiskfs / osd_internal.h

diff --git a/lustre/osd-ldiskfs/osd_internal.h b/lustre/osd-ldiskfs/osd_internal.h
index dba072a..fc9ab44 100644 (file)
--- a/lustre/osd-ldiskfs/osd_internal.h
+++ b/lustre/osd-ldiskfs/osd_internal.h
@@ -689,6 +689,12 @@ struct osd_thread_info {
 
 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))
@@ -791,10 +797,11 @@ int osd_oii_lookup(struct osd_device *dev, const struct lu_fid *fid,
                   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);
@@ -915,7 +922,7 @@ static inline struct buffer_head *osd_ldiskfs_append(handle_t *handle,
                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)