X-Git-Url: https://git.camperquake.de/gitweb.cgi?a=blobdiff_plain;f=module%2Fzfs%2Fzpl_inode.c;h=029a4038b10b411611cc1827e409f19b081de15a;hb=055656d4f4dfc1a85646a2c0cc10b9dce86da72b;hp=637a7dc698b898a8e372eda6697a2b89a46e250c;hpb=a6695d83b763aaeeeeb6d4bdb57ed59a384106f7;p=zfs.git

diff --git a/module/zfs/zpl_inode.c b/module/zfs/zpl_inode.c
index 637a7dc..029a403 100644
--- a/module/zfs/zpl_inode.c
+++ b/module/zfs/zpl_inode.c
@@ -32,14 +32,14 @@
 static struct dentry *
 zpl_lookup(struct inode *dir, struct dentry *dentry, struct nameidata *nd)
 {
+	cred_t *cr = CRED();
 	struct inode *ip;
-	cred_t *cr;
 	int error;
 
-	cr = (cred_t *)get_current_cred();
+	crhold(cr);
 	error = -zfs_lookup(dir, dname(dentry), &ip, 0, cr, NULL, NULL);
 	ASSERT3S(error, <=, 0);
-	put_cred(cr);
+	crfree(cr);
 
 	if (error) {
 		if (error == -ENOENT)
@@ -55,27 +55,23 @@ static int
 zpl_create(struct inode *dir, struct dentry *dentry, int mode,
     struct nameidata *nd)
 {
-	const struct cred *cred;
+	cred_t *cr = CRED();
 	struct inode *ip;
 	vattr_t *vap;
 	int error;
 
-	cred = get_current_cred();
+	crhold(cr);
 	vap = kmem_zalloc(sizeof(vattr_t), KM_SLEEP);
 	vap->va_mode = mode;
 	vap->va_mask = ATTR_MODE;
-	vap->va_uid = current_fsuid();
-	vap->va_gid = current_fsgid();
+	vap->va_uid = crgetfsuid(cr);
+	vap->va_gid = crgetfsgid(cr);
+	vap->va_dentry = dentry;
 
 	error = -zfs_create(dir, (char *)dentry->d_name.name,
-	    vap, 0, mode, &ip, (struct cred *)cred, 0, NULL);
-	if (error)
-		goto out;
-
-	d_instantiate(dentry, ip);
-out:
+	    vap, 0, mode, &ip, cr, 0, NULL);
 	kmem_free(vap, sizeof(vattr_t));
-	put_cred(cred);
+	crfree(cr);
 	ASSERT3S(error, <=, 0);
 
 	return (error);
@@ -84,28 +80,24 @@ out:
 static int
 zpl_mknod(struct inode *dir, struct dentry *dentry, int mode, dev_t rdev)
 {
-        const struct cred *cred;
+	cred_t *cr = CRED();
 	struct inode *ip;
 	vattr_t *vap;
 	int error;
 
-	cred = get_current_cred();
+	crhold(cr);
 	vap = kmem_zalloc(sizeof(vattr_t), KM_SLEEP);
 	vap->va_mode = mode;
 	vap->va_mask = ATTR_MODE;
 	vap->va_rdev = rdev;
-	vap->va_uid = current_fsuid();
-	vap->va_gid = current_fsgid();
+	vap->va_uid = crgetfsuid(cr);
+	vap->va_gid = crgetfsgid(cr);
+	vap->va_dentry = dentry;
 
 	error = -zfs_create(dir, (char *)dentry->d_name.name,
-	    vap, 0, mode, &ip, (struct cred *)cred, 0, NULL);
-	if (error)
-		goto out;
-
-	d_instantiate(dentry, ip);
-out:
+	    vap, 0, mode, &ip, cr, 0, NULL);
 	kmem_free(vap, sizeof(vattr_t));
-	put_cred(cred);
+	crfree(cr);
 	ASSERT3S(error, <=, 0);
 
 	return (-error);
@@ -114,12 +106,12 @@ out:
 static int
 zpl_unlink(struct inode *dir, struct dentry *dentry)
 {
-	cred_t *cr;
+	cred_t *cr = CRED();
 	int error;
 
-	cr = (cred_t *)get_current_cred();
+	crhold(cr);
 	error = -zfs_remove(dir, dname(dentry), cr);
-	put_cred(cr);
+	crfree(cr);
 	ASSERT3S(error, <=, 0);
 
 	return (error);
@@ -128,26 +120,22 @@ zpl_unlink(struct inode *dir, struct dentry *dentry)
 static int
 zpl_mkdir(struct inode *dir, struct dentry *dentry, int mode)
 {
-	cred_t *cr;
+	cred_t *cr = CRED();
 	vattr_t *vap;
 	struct inode *ip;
 	int error;
 
-	cr = (cred_t *)get_current_cred();
+	crhold(cr);
 	vap = kmem_zalloc(sizeof(vattr_t), KM_SLEEP);
 	vap->va_mode = S_IFDIR | mode;
 	vap->va_mask = ATTR_MODE;
-	vap->va_uid = current_fsuid();
-	vap->va_gid = current_fsgid();
+	vap->va_uid = crgetfsuid(cr);
+	vap->va_gid = crgetfsgid(cr);
+	vap->va_dentry = dentry;
 
 	error = -zfs_mkdir(dir, dname(dentry), vap, &ip, cr, 0, NULL);
-	if (error)
-		goto out;
-
-	d_instantiate(dentry, ip);
-out:
 	kmem_free(vap, sizeof(vattr_t));
-	put_cred(cr);
+	crfree(cr);
 	ASSERT3S(error, <=, 0);
 
 	return (error);
@@ -156,12 +144,12 @@ out:
 static int
 zpl_rmdir(struct inode * dir, struct dentry *dentry)
 {
-	cred_t *cr;
+	cred_t *cr = CRED();
 	int error;
 
-	cr = (cred_t *)get_current_cred();
+	crhold(cr);
 	error = -zfs_rmdir(dir, dname(dentry), NULL, cr, 0);
-	put_cred(cr);
+	crfree(cr);
 	ASSERT3S(error, <=, 0);
 
 	return (error);
@@ -170,45 +158,81 @@ zpl_rmdir(struct inode * dir, struct dentry *dentry)
 static int
 zpl_getattr(struct vfsmount *mnt, struct dentry *dentry, struct kstat *stat)
 {
-	cred_t *cr;
+	cred_t *cr = CRED();
+	vattr_t *vap;
+	struct inode *ip;
 	int error;
 
-	cr = (cred_t *)get_current_cred();
-	error = -zfs_getattr(dentry->d_inode, stat, 0, cr);
-	put_cred(cr);
+	ip = dentry->d_inode;
+	crhold(cr);
+	vap = kmem_zalloc(sizeof(vattr_t), KM_SLEEP);
+
+	error = -zfs_getattr(ip, vap, 0, cr);
+	if (error)
+		goto out;
+
+	stat->ino = ip->i_ino;
+	stat->dev = ip->i_sb->s_dev;
+	stat->mode = vap->va_mode;
+	stat->nlink = vap->va_nlink;
+	stat->uid = vap->va_uid;
+	stat->gid = vap->va_gid;
+	stat->rdev = vap->va_rdev;
+	stat->size = vap->va_size;
+	stat->atime = vap->va_atime;
+	stat->mtime = vap->va_mtime;
+	stat->ctime = vap->va_ctime;
+	stat->blksize = vap->va_blksize;
+	stat->blocks = vap->va_nblocks;
+out:
+	kmem_free(vap, sizeof(vattr_t));
+	crfree(cr);
 	ASSERT3S(error, <=, 0);
 
 	return (error);
 }
 
 static int
-zpl_setattr(struct dentry *dentry, struct iattr *attr)
+zpl_setattr(struct dentry *dentry, struct iattr *ia)
 {
-	cred_t *cr;
+	cred_t *cr = CRED();
+	vattr_t *vap;
 	int error;
 
-	error = inode_change_ok(dentry->d_inode, attr);
+	error = inode_change_ok(dentry->d_inode, ia);
 	if (error)
 		return (error);
 
-	cr = (cred_t *)get_current_cred();
-	error = -zfs_setattr(dentry->d_inode, attr, 0, cr);
-	put_cred(cr);
+	crhold(cr);
+	vap = kmem_zalloc(sizeof(vattr_t), KM_SLEEP);
+	vap->va_mask = ia->ia_valid & ATTR_IATTR_MASK;
+	vap->va_mode = ia->ia_mode;
+	vap->va_uid = ia->ia_uid;
+	vap->va_gid = ia->ia_gid;
+	vap->va_size = ia->ia_size;
+	vap->va_atime = ia->ia_atime;
+	vap->va_mtime = ia->ia_mtime;
+	vap->va_ctime = ia->ia_ctime;
+
+	error = -zfs_setattr(dentry->d_inode, vap, 0, cr);
+
+	kmem_free(vap, sizeof(vattr_t));
+	crfree(cr);
 	ASSERT3S(error, <=, 0);
 
-	return (-error);
+	return (error);
 }
 
 static int
 zpl_rename(struct inode *sdip, struct dentry *sdentry,
     struct inode *tdip, struct dentry *tdentry)
 {
-	cred_t *cr;
+	cred_t *cr = CRED();
 	int error;
 
-	cr = (cred_t *)get_current_cred();
+	crhold(cr);
 	error = -zfs_rename(sdip, dname(sdentry), tdip, dname(tdentry), cr, 0);
-	put_cred(cr);
+	crfree(cr);
 	ASSERT3S(error, <=, 0);
 
 	return (error);
@@ -217,26 +241,22 @@ zpl_rename(struct inode *sdip, struct dentry *sdentry,
 static int
 zpl_symlink(struct inode *dir, struct dentry *dentry, const char *name)
 {
-	cred_t *cr;
+	cred_t *cr = CRED();
 	vattr_t *vap;
 	struct inode *ip;
 	int error;
 
-	cr = (cred_t *)get_current_cred();
+	crhold(cr);
 	vap = kmem_zalloc(sizeof(vattr_t), KM_SLEEP);
 	vap->va_mode = S_IFLNK | S_IRWXUGO;
 	vap->va_mask = ATTR_MODE;
-	vap->va_uid = current_fsuid();
-	vap->va_gid = current_fsgid();
+	vap->va_uid = crgetfsuid(cr);
+	vap->va_gid = crgetfsgid(cr);
+	vap->va_dentry = dentry;
 
 	error = -zfs_symlink(dir, dname(dentry), vap, (char *)name, &ip, cr, 0);
-	if (error)
-		goto out;
-
-	d_instantiate(dentry, ip);
-out:
 	kmem_free(vap, sizeof(vattr_t));
-	put_cred(cr);
+	crfree(cr);
 	ASSERT3S(error, <=, 0);
 
 	return (error);
@@ -245,8 +265,33 @@ out:
 static void *
 zpl_follow_link(struct dentry *dentry, struct nameidata *nd)
 {
-	(void) zfs_follow_link(dentry, nd);
-	return NULL;
+	cred_t *cr = CRED();
+	struct inode *ip = dentry->d_inode;
+	struct iovec iov;
+	uio_t uio;
+	char *link;
+	int error;
+
+	crhold(cr);
+
+	iov.iov_len = MAXPATHLEN;
+	iov.iov_base = link = kmem_zalloc(MAXPATHLEN, KM_SLEEP);
+
+	uio.uio_iov = &iov;
+	uio.uio_iovcnt = 1;
+	uio.uio_resid = (MAXPATHLEN - 1);
+	uio.uio_segflg = UIO_SYSSPACE;
+
+	error = -zfs_readlink(ip, &uio, cr);
+	if (error) {
+		kmem_free(link, MAXPATHLEN);
+		nd_set_link(nd, ERR_PTR(error));
+	} else {
+		nd_set_link(nd, link);
+	}
+
+	crfree(cr);
+	return (NULL);
 }
 
 static void
@@ -256,20 +301,20 @@ zpl_put_link(struct dentry *dentry, struct nameidata *nd, void *ptr)
 
 	link = nd_get_link(nd);
 	if (!IS_ERR(link))
-		kmem_free(link, MAXPATHLEN + 1);
+		kmem_free(link, MAXPATHLEN);
 }
 
 static int
 zpl_link(struct dentry *old_dentry, struct inode *dir, struct dentry *dentry)
 {
+	cred_t *cr = CRED();
 	struct inode *ip = old_dentry->d_inode;
-	cred_t *cr;
 	int error;
 
 	if (ip->i_nlink >= ZFS_LINK_MAX)
 		return -EMLINK;
 
-	cr = (cred_t *)get_current_cred();
+	crhold(cr);
 	ip->i_ctime = CURRENT_TIME_SEC;
 	igrab(ip); /* Use ihold() if available */
 
@@ -281,7 +326,7 @@ zpl_link(struct dentry *old_dentry, struct inode *dir, struct dentry *dentry)
 
 	d_instantiate(dentry, ip);
 out:
-	put_cred(cr);
+	crfree(cr);
 	ASSERT3S(error, <=, 0);
 
 	return (error);