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)
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);
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);
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);
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);
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);
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;
ip = dentry->d_inode;
- cr = (cred_t *)get_current_cred();
+ crhold(cr);
vap = kmem_zalloc(sizeof(vattr_t), KM_SLEEP);
error = -zfs_getattr(ip, vap, 0, cr);
stat->blocks = vap->va_nblocks;
out:
kmem_free(vap, sizeof(vattr_t));
- put_cred(cr);
+ crfree(cr);
ASSERT3S(error, <=, 0);
return (error);
static int
zpl_setattr(struct dentry *dentry, struct iattr *ia)
{
- cred_t *cr;
+ cred_t *cr = CRED();
vattr_t *vap;
int error;
if (error)
return (error);
- cr = (cred_t *)get_current_cred();
+ 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;
error = -zfs_setattr(dentry->d_inode, vap, 0, cr);
kmem_free(vap, sizeof(vattr_t));
- put_cred(cr);
+ crfree(cr);
ASSERT3S(error, <=, 0);
return (error);
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);
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);
static void *
zpl_follow_link(struct dentry *dentry, struct nameidata *nd)
{
+ cred_t *cr = CRED();
struct inode *ip = dentry->d_inode;
struct iovec iov;
uio_t uio;
char *link;
- cred_t *cr;
int error;
- cr = (cred_t *)get_current_cred();
+ crhold(cr);
iov.iov_len = MAXPATHLEN;
iov.iov_base = link = kmem_zalloc(MAXPATHLEN, KM_SLEEP);
nd_set_link(nd, link);
}
- put_cred(cr);
+ crfree(cr);
return (NULL);
}
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 */
d_instantiate(dentry, ip);
out:
- put_cred(cr);
+ crfree(cr);
ASSERT3S(error, <=, 0);
return (error);