Linux 2.6.29 compat, credentials

As of Linux 2.6.29 a clean credential API was added to the Linux kernel.
Previously the credential was embedded in the task_struct.  Because the
SPL already has considerable support for handling this API change the
ZPL code has been updated to use the Solaris credential API.

diff --git a/module/zfs/zpl_file.c b/module/zfs/zpl_file.c
index d76e62d4326a16257e88d9e78034bf2dc24bebad..c8a3fedb7c8e7ba9719b29f1d760b1854067313d 100644 (file)
--- a/module/zfs/zpl_file.c
+++ b/module/zfs/zpl_file.c
@@ -32,12 +32,12 @@
 static int
 zpl_open(struct inode *ip, struct file *filp)
 {
-       cred_t *cr;
+       cred_t *cr = CRED();
        int error;
 
-       cr = (cred_t *)get_current_cred();
+       crhold(cr);
        error = -zfs_open(ip, filp->f_mode, filp->f_flags, cr);
-       put_cred(cr);
+       crfree(cr);
        ASSERT3S(error, <=, 0);
 
        if (error)
@@ -49,12 +49,12 @@ zpl_open(struct inode *ip, struct file *filp)
 static int
 zpl_release(struct inode *ip, struct file *filp)
 {
-       cred_t *cr;
+       cred_t *cr = CRED();
        int error;
 
-       cr = (cred_t *)get_current_cred();
+       crhold(cr);
        error = -zfs_close(ip, filp->f_flags, cr);
-       put_cred(cr);
+       crfree(cr);
        ASSERT3S(error, <=, 0);
 
        return (error);
@@ -64,13 +64,13 @@ static int
 zpl_readdir(struct file *filp, void *dirent, filldir_t filldir)
 {
        struct dentry *dentry = filp->f_path.dentry;
-       cred_t *cr;
+       cred_t *cr = CRED();
        int error;
 
-       cr = (cred_t *)get_current_cred();
+       crhold(cr);
        error = -zfs_readdir(dentry->d_inode, dirent, filldir,
            &filp->f_pos, cr);
-       put_cred(cr);
+       crfree(cr);
        ASSERT3S(error, <=, 0);
 
        return (error);
@@ -78,12 +78,12 @@ zpl_readdir(struct file *filp, void *dirent, filldir_t filldir)
 
 ZPL_FSYNC_PROTO(zpl_fsync, filp, unused_dentry, datasync)
 {
-       cred_t *cr;
+       cred_t *cr = CRED();
        int error;
 
-       cr = (cred_t *)get_current_cred();
+       crhold(cr);
        error = -zfs_fsync(filp->f_path.dentry->d_inode, datasync, cr);
-       put_cred(cr);
+       crfree(cr);
        ASSERT3S(error, <=, 0);
 
        return (error);
@@ -117,13 +117,13 @@ zpl_read_common(struct inode *ip, const char *buf, size_t len, loff_t pos,
 static ssize_t
 zpl_read(struct file *filp, char __user *buf, size_t len, loff_t *ppos)
 {
-       cred_t *cr;
+       cred_t *cr = CRED();
        ssize_t read;
 
-       cr = (cred_t *)get_current_cred();
+       crhold(cr);
        read = zpl_read_common(filp->f_mapping->host, buf, len, *ppos,
            UIO_USERSPACE, filp->f_flags, cr);
-       put_cred(cr);
+       crfree(cr);
 
        if (read < 0)
                return (read);
@@ -160,13 +160,13 @@ zpl_write_common(struct inode *ip, const char *buf, size_t len, loff_t pos,
 static ssize_t
 zpl_write(struct file *filp, const char __user *buf, size_t len, loff_t *ppos)
 {
-       cred_t *cr;
+       cred_t *cr = CRED();
        ssize_t wrote;
 
-       cr = (cred_t *)get_current_cred();
+       crhold(cr);
        wrote = zpl_write_common(filp->f_mapping->host, buf, len, *ppos,
            UIO_USERSPACE, filp->f_flags, cr);
-       put_cred(cr);
+       crfree(cr);
 
        if (wrote < 0)
                return (wrote);
@@ -250,7 +250,7 @@ zpl_readpage(struct file *filp, struct page *pp)
        struct inode *ip;
        loff_t off, i_size;
        size_t len, wrote;
-       cred_t *cr;
+       cred_t *cr = CRED();
        void *pb;
        int error = 0;
 
@@ -260,7 +260,7 @@ zpl_readpage(struct file *filp, struct page *pp)
        i_size = i_size_read(ip);
        ASSERT3S(off, <, i_size);
 
-       cr = (cred_t *)get_current_cred();
+       crhold(cr);
        len = MIN(PAGE_CACHE_SIZE, i_size - off);
 
        pb = kmap(pp);
@@ -274,7 +274,7 @@ zpl_readpage(struct file *filp, struct page *pp)
                memset(pb + len, 0, PAGE_CACHE_SIZE - len);
 
        kunmap(pp);
-       put_cred(cr);
+       crfree(cr);
 
        if (error) {
                SetPageError(pp);
@@ -306,7 +306,7 @@ zpl_writepage(struct page *pp, struct writeback_control *wbc)
        struct inode *ip;
        loff_t off, i_size;
        size_t len, read;
-       cred_t *cr;
+       cred_t *cr = CRED();
        void *pb;
        int error = 0;
 
@@ -315,7 +315,7 @@ zpl_writepage(struct page *pp, struct writeback_control *wbc)
        off = page_offset(pp);
        i_size = i_size_read(ip);
 
-       cr = (cred_t *)get_current_cred();
+       crhold(cr);
        len = MIN(PAGE_CACHE_SIZE, i_size - off);
 
        pb = kmap(pp);
@@ -326,7 +326,7 @@ zpl_writepage(struct page *pp, struct writeback_control *wbc)
                error = -EIO;
 
        kunmap(pp);
-       put_cred(cr);
+       crfree(cr);
 
        if (error) {
                SetPageError(pp);

diff --git a/module/zfs/zpl_inode.c b/module/zfs/zpl_inode.c
index c4ff14fbb34979a4cad3ee80773863d80eafeaef..fcc19b00436699d892c877d9f741b123e9f63ef0 100644 (file)
--- 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,27 @@ 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);
 
        error = -zfs_create(dir, (char *)dentry->d_name.name,
-           vap, 0, mode, &ip, (struct cred *)cred, 0, NULL);
+           vap, 0, mode, &ip, cr, 0, NULL);
        if (error)
                goto out;
 
        d_instantiate(dentry, ip);
 out:
        kmem_free(vap, sizeof(vattr_t));
-       put_cred(cred);
+       crfree(cr);
        ASSERT3S(error, <=, 0);
 
        return (error);
@@ -84,28 +84,28 @@ 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);
 
        error = -zfs_create(dir, (char *)dentry->d_name.name,
-           vap, 0, mode, &ip, (struct cred *)cred, 0, NULL);
+           vap, 0, mode, &ip, cr, 0, NULL);
        if (error)
                goto out;
 
        d_instantiate(dentry, ip);
 out:
        kmem_free(vap, sizeof(vattr_t));
-       put_cred(cred);
+       crfree(cr);
        ASSERT3S(error, <=, 0);
 
        return (-error);
@@ -114,12 +114,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,17 +128,17 @@ 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);
 
        error = -zfs_mkdir(dir, dname(dentry), vap, &ip, cr, 0, NULL);
        if (error)
@@ -147,7 +147,7 @@ zpl_mkdir(struct inode *dir, struct dentry *dentry, int mode)
        d_instantiate(dentry, ip);
 out:
        kmem_free(vap, sizeof(vattr_t));
-       put_cred(cr);
+       crfree(cr);
        ASSERT3S(error, <=, 0);
 
        return (error);
@@ -156,12 +156,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,13 +170,13 @@ 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;
 
        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);
@@ -198,7 +198,7 @@ zpl_getattr(struct vfsmount *mnt, struct dentry *dentry, struct kstat *stat)
        stat->blocks = vap->va_nblocks;
 out:
        kmem_free(vap, sizeof(vattr_t));
-       put_cred(cr);
+       crfree(cr);
        ASSERT3S(error, <=, 0);
 
        return (error);
@@ -207,7 +207,7 @@ out:
 static int
 zpl_setattr(struct dentry *dentry, struct iattr *ia)
 {
-       cred_t *cr;
+       cred_t *cr = CRED();
        vattr_t *vap;
        int error;
 
@@ -215,7 +215,7 @@ zpl_setattr(struct dentry *dentry, struct iattr *ia)
        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;
@@ -229,7 +229,7 @@ zpl_setattr(struct dentry *dentry, struct iattr *ia)
        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);
@@ -239,12 +239,12 @@ 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);
@@ -253,17 +253,17 @@ 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);
 
        error = -zfs_symlink(dir, dname(dentry), vap, (char *)name, &ip, cr, 0);
        if (error)
@@ -272,7 +272,7 @@ zpl_symlink(struct inode *dir, struct dentry *dentry, const char *name)
        d_instantiate(dentry, ip);
 out:
        kmem_free(vap, sizeof(vattr_t));
-       put_cred(cr);
+       crfree(cr);
        ASSERT3S(error, <=, 0);
 
        return (error);
@@ -281,14 +281,14 @@ out:
 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);
@@ -306,7 +306,7 @@ zpl_follow_link(struct dentry *dentry, struct nameidata *nd)
                nd_set_link(nd, link);
        }
 
-       put_cred(cr);
+       crfree(cr);
        return (NULL);
 }
 
@@ -323,14 +323,14 @@ zpl_put_link(struct dentry *dentry, struct nameidata *nd, void *ptr)
 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 */
 
@@ -342,7 +342,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);

diff --git a/module/zfs/zpl_xattr.c b/module/zfs/zpl_xattr.c
index 7a1ecec8f14bb442cad2f2c7c1a9e3d307bc7aef..82787cb2d29c23269ad96ba542fdd403f9956705 100644 (file)
--- a/module/zfs/zpl_xattr.c
+++ b/module/zfs/zpl_xattr.c
@@ -110,11 +110,11 @@ zpl_xattr_list(struct dentry *dentry, char *buffer, size_t buffer_size)
        struct inode *ip = dentry->d_inode;
        struct inode *dxip = NULL;
        loff_t pos = 3;  /* skip '.', '..', and '.zfs' entries. */
-       cred_t *cr;
+       cred_t *cr = CRED();
        int error;
        xattr_filldir_t xf = { buffer_size, 0, buffer, ip };
 
-       cr = (cred_t *)get_current_cred();
+       crhold(cr);
 
        /* Lookup the xattr directory */
        error = -zfs_lookup(ip, NULL, &dxip, LOOKUP_XATTR, cr, NULL, NULL);
@@ -135,7 +135,7 @@ out:
        if (dxip)
                iput(dxip);
 
-       put_cred(cr);
+       crfree(cr);
 
        return (error);
 }
@@ -145,10 +145,10 @@ zpl_xattr_get(struct inode *ip, const char *name, void *buf, size_t size)
 {
        struct inode *dxip = NULL;
        struct inode *xip = NULL;
-       cred_t *cr;
+       cred_t *cr = CRED();
        int error;
 
-       cr = (cred_t *)get_current_cred();
+       crhold(cr);
 
        /* Lookup the xattr directory */
        error = -zfs_lookup(ip, NULL, &dxip, LOOKUP_XATTR, cr, NULL, NULL);
@@ -173,7 +173,7 @@ out:
        if (dxip)
                iput(dxip);
 
-       put_cred(cr);
+       crfree(cr);
 
        if (error == -ENOENT)
                error = -ENODATA;
@@ -188,11 +188,11 @@ zpl_xattr_set(struct inode *ip, const char *name, const void *value,
        struct inode *dxip = NULL;
        struct inode *xip = NULL;
        vattr_t *vap = NULL;
-       cred_t *cr;
+       cred_t *cr = CRED();
        ssize_t wrote;
        int error;
 
-       cr = (cred_t *)get_current_cred();
+       crhold(cr);
 
        /* Lookup the xattr directory and create it if required. */
        error = -zfs_lookup(ip, NULL, &dxip, LOOKUP_XATTR | CREATE_XATTR_DIR,
@@ -232,8 +232,8 @@ zpl_xattr_set(struct inode *ip, const char *name, const void *value,
                vap = kmem_zalloc(sizeof(vattr_t), KM_SLEEP);
                vap->va_mode = S_IFREG | 0644;
                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);
 
                error = -zfs_create(dxip, (char *)name, vap, 0, 0644, &xip,
                    cr, 0, NULL);
@@ -256,7 +256,7 @@ out:
        if (dxip)
                iput(dxip);
 
-       put_cred(cr);
+       crfree(cr);
        if (error == -ENOENT)
                error = -ENODATA;