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
Linux 3.5 compat, eops->encode_fh() takes inodes
[zfs.git]
/
module
/
zfs
/
zpl_inode.c
diff --git
a/module/zfs/zpl_inode.c
b/module/zfs/zpl_inode.c
index
d9b918b
..
ea8c309
100644
(file)
--- a/
module/zfs/zpl_inode.c
+++ b/
module/zfs/zpl_inode.c
@@
-54,7
+54,7
@@
zpl_lookup(struct inode *dir, struct dentry *dentry, struct nameidata *nd)
void
zpl_vap_init(vattr_t *vap, struct inode *dir, struct dentry *dentry,
void
zpl_vap_init(vattr_t *vap, struct inode *dir, struct dentry *dentry,
- mode_t mode, cred_t *cr)
+
zpl_u
mode_t mode, cred_t *cr)
{
vap->va_mask = ATTR_MODE;
vap->va_mode = mode;
{
vap->va_mask = ATTR_MODE;
vap->va_mode = mode;
@@
-71,7
+71,7
@@
zpl_vap_init(vattr_t *vap, struct inode *dir, struct dentry *dentry,
}
static int
}
static int
-zpl_create(struct inode *dir, struct dentry *dentry,
in
t mode,
+zpl_create(struct inode *dir, struct dentry *dentry,
zpl_umode_
t mode,
struct nameidata *nd)
{
cred_t *cr = CRED();
struct nameidata *nd)
{
cred_t *cr = CRED();
@@
-93,7
+93,8
@@
zpl_create(struct inode *dir, struct dentry *dentry, int mode,
}
static int
}
static int
-zpl_mknod(struct inode *dir, struct dentry *dentry, int mode, dev_t rdev)
+zpl_mknod(struct inode *dir, struct dentry *dentry, zpl_umode_t mode,
+ dev_t rdev)
{
cred_t *cr = CRED();
struct inode *ip;
{
cred_t *cr = CRED();
struct inode *ip;
@@
-136,7
+137,7
@@
zpl_unlink(struct inode *dir, struct dentry *dentry)
}
static int
}
static int
-zpl_mkdir(struct inode *dir, struct dentry *dentry,
in
t mode)
+zpl_mkdir(struct inode *dir, struct dentry *dentry,
zpl_umode_
t mode)
{
cred_t *cr = CRED();
vattr_t *vap;
{
cred_t *cr = CRED();
vattr_t *vap;
@@
-293,9
+294,8
@@
zpl_follow_link(struct dentry *dentry, struct nameidata *nd)
static void
zpl_put_link(struct dentry *dentry, struct nameidata *nd, void *ptr)
{
static void
zpl_put_link(struct dentry *dentry, struct nameidata *nd, void *ptr)
{
- c
har *link
;
+ c
onst char *link = nd_get_link(nd)
;
- link = nd_get_link(nd);
if (!IS_ERR(link))
kmem_free(link, MAXPATHLEN);
}
if (!IS_ERR(link))
kmem_free(link, MAXPATHLEN);
}