Whamcloud - gitweb
git://git.whamcloud.com
/
fs
/
lustre-release.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
LU-12904 ldiskfs: Add ldiskfs support for linux 5.4
[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
f7c1fcb
..
9ed1748
100644
(file)
--- 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);
}
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))
(__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) \
# 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;
}
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))
(__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)
# 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
/*
#endif
/*