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
Increase ZFS_OBJ_MTX_SZ to 256
[zfs.git]
/
module
/
zfs
/
zpl_ctldir.c
diff --git
a/module/zfs/zpl_ctldir.c
b/module/zfs/zpl_ctldir.c
index
6c742c9
..
7dfaf6e
100644
(file)
--- a/
module/zfs/zpl_ctldir.c
+++ b/
module/zfs/zpl_ctldir.c
@@
-143,7
+143,11
@@
zpl_root_getattr(struct vfsmount *mnt, struct dentry *dentry,
}
static struct dentry *
}
static struct dentry *
+#ifdef HAVE_LOOKUP_NAMEIDATA
zpl_root_lookup(struct inode *dip, struct dentry *dentry, struct nameidata *nd)
zpl_root_lookup(struct inode *dip, struct dentry *dentry, struct nameidata *nd)
+#else
+zpl_root_lookup(struct inode *dip, struct dentry *dentry, unsigned int flags)
+#endif
{
cred_t *cr = CRED();
struct inode *ip;
{
cred_t *cr = CRED();
struct inode *ip;
@@
-180,8
+184,14
@@
const struct inode_operations zpl_ops_root = {
};
static struct dentry *
};
static struct dentry *
+#ifdef HAVE_LOOKUP_NAMEIDATA
zpl_snapdir_lookup(struct inode *dip, struct dentry *dentry,
struct nameidata *nd)
zpl_snapdir_lookup(struct inode *dip, struct dentry *dentry,
struct nameidata *nd)
+#else
+zpl_snapdir_lookup(struct inode *dip, struct dentry *dentry,
+ unsigned int flags)
+#endif
+
{
cred_t *cr = CRED();
struct inode *ip;
{
cred_t *cr = CRED();
struct inode *ip;
@@
-300,7
+310,7
@@
zpl_snapdir_rmdir(struct inode *dip, struct dentry *dentry)
}
static int
}
static int
-zpl_snapdir_mkdir(struct inode *dip, struct dentry *dentry,
in
t mode)
+zpl_snapdir_mkdir(struct inode *dip, struct dentry *dentry,
zpl_umode_
t mode)
{
cred_t *cr = CRED();
vattr_t *vap;
{
cred_t *cr = CRED();
vattr_t *vap;
@@
-410,8
+420,13
@@
const struct dentry_operations zpl_dops_snapdirs = {
#endif /* HAVE_AUTOMOUNT */
static struct dentry *
#endif /* HAVE_AUTOMOUNT */
static struct dentry *
+#ifdef HAVE_LOOKUP_NAMEIDATA
zpl_shares_lookup(struct inode *dip, struct dentry *dentry,
struct nameidata *nd)
zpl_shares_lookup(struct inode *dip, struct dentry *dentry,
struct nameidata *nd)
+#else
+zpl_shares_lookup(struct inode *dip, struct dentry *dentry,
+ unsigned int flags)
+#endif
{
cred_t *cr = CRED();
struct inode *ip = NULL;
{
cred_t *cr = CRED();
struct inode *ip = NULL;