git://git.camperquake.de
/
zfs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix zvol+btrfs hang
[zfs.git]
/
module
/
zfs
/
zpl_inode.c
diff --git
a/module/zfs/zpl_inode.c
b/module/zfs/zpl_inode.c
index
0dab82c
..
bb389f8
100644
(file)
--- a/
module/zfs/zpl_inode.c
+++ b/
module/zfs/zpl_inode.c
@@
-31,7
+31,11
@@
static struct dentry *
static struct dentry *
+#ifdef HAVE_LOOKUP_NAMEIDATA
zpl_lookup(struct inode *dir, struct dentry *dentry, struct nameidata *nd)
zpl_lookup(struct inode *dir, struct dentry *dentry, struct nameidata *nd)
+#else
+zpl_lookup(struct inode *dir, struct dentry *dentry, unsigned int flags)
+#endif
{
cred_t *cr = CRED();
struct inode *ip;
{
cred_t *cr = CRED();
struct inode *ip;
@@
-71,8
+75,13
@@
zpl_vap_init(vattr_t *vap, struct inode *dir, struct dentry *dentry,
}
static int
}
static int
+#ifdef HAVE_CREATE_NAMEIDATA
zpl_create(struct inode *dir, struct dentry *dentry, zpl_umode_t mode,
struct nameidata *nd)
zpl_create(struct inode *dir, struct dentry *dentry, zpl_umode_t mode,
struct nameidata *nd)
+#else
+zpl_create(struct inode *dir, struct dentry *dentry, zpl_umode_t mode,
+ bool flag)
+#endif
{
cred_t *cr = CRED();
struct inode *ip;
{
cred_t *cr = CRED();
struct inode *ip;