X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Fosd-ldiskfs%2Fosd_internal.h;h=9ed174895311ffff48f19432a6baf83dec163317;hp=f7c1fcb6c224198e440d3bbba9e68f2c41933c41;hb=288cfdfa8d6cee3e5e061b129035965c4054d1df;hpb=9e7aa04af2591ae0ee942e0d72ac8a296a59b798

diff --git a/lustre/osd-ldiskfs/osd_internal.h b/lustre/osd-ldiskfs/osd_internal.h
index f7c1fcb..9ed1748 100644
--- a/lustre/osd-ldiskfs/osd_internal.h
+++ b/lustre/osd-ldiskfs/osd_internal.h
@@ -908,9 +908,17 @@ static inline struct buffer_head *osd_ldiskfs_append(handle_t *handle,
 		return ERR_PTR(rc);
 	return ldiskfs_append(handle, inode, nblock);
 }
-# define osd_ldiskfs_find_entry(dir, name, de, inlined, lock) \
+
+# ifdef HAVE___LDISKFS_FIND_ENTRY
+#  define osd_ldiskfs_find_entry(dir, name, de, inlined, lock) \
 		(__ldiskfs_find_entry(dir, name, de, inlined, lock) ?: \
 		 ERR_PTR(-ENOENT))
+# else
+#  define osd_ldiskfs_find_entry(dir, name, de, inlined, lock) \
+		(ldiskfs_find_entry_locked(dir, name, de, inlined, lock) ?: \
+		 ERR_PTR(-ENOENT))
+# endif
+
 # define osd_journal_start(inode, type, nblocks) \
 		ldiskfs_journal_start(inode, type, nblocks)
 # define osd_transaction_size(dev) \
@@ -934,13 +942,24 @@ static inline struct buffer_head *osd_ldiskfs_append(handle_t *handle,
 	return bh;
 }
 
-# define osd_ldiskfs_find_entry(dir, name, de, inlined, lock) \
+# ifdef HAVE___LDISKFS_FIND_ENTRY
+#  define osd_ldiskfs_find_entry(dir, name, de, inlined, lock) \
 		(__ldiskfs_find_entry(dir, name, de, lock) ?: \
 		 ERR_PTR(-ENOENT))
+# else
+#  define osd_ldiskfs_find_entry(dir, name, de, inlined, lock) \
+		(ldiskfs_find_entry_locked(dir, name, de, lock) ?: \
+		 ERR_PTR(-ENOENT))
+# endif
 # define osd_journal_start(inode, type, nblocks) \
 		ldiskfs_journal_start(inode, nblocks)
 # define osd_transaction_size(dev) \
 		(osd_journal(dev)->j_max_transaction_buffers)
+#endif /* LDISKFS_HT_MISC */
+
+#ifndef HAVE___LDISKFS_FIND_ENTRY
+# define __ldiskfs_add_entry(handle, child, inode, hlock) \
+		ldiskfs_add_entry_locked(handle, child, inode, hlock)
 #endif
 
 /*