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)
return d_splice_alias(ip, dentry);
}
+static void
+zpl_vap_init(vattr_t *vap, struct inode *dir, struct dentry *dentry,
+ mode_t mode, cred_t *cr)
+{
+ vap->va_mask = ATTR_MODE;
+ vap->va_mode = mode;
+ vap->va_dentry = dentry;
+ vap->va_uid = crgetfsuid(cr);
+
+ if (dir && dir->i_mode & S_ISGID) {
+ vap->va_gid = dir->i_gid;
+ if (S_ISDIR(mode))
+ vap->va_mode |= S_ISGID;
+ } else {
+ vap->va_gid = crgetfsgid(cr);
+ }
+}
+
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();
+ zpl_vap_init(vap, dir, dentry, mode, cr);
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();
+ /*
+ * We currently expect Linux to supply rdev=0 for all sockets
+ * and fifos, but we want to know if this behavior ever changes.
+ */
+ if (S_ISSOCK(mode) || S_ISFIFO(mode))
+ ASSERT(rdev == 0);
+
+ crhold(cr);
vap = kmem_zalloc(sizeof(vattr_t), KM_SLEEP);
- vap->va_mode = mode;
- vap->va_mask = ATTR_MODE;
+ zpl_vap_init(vap, dir, dentry, mode, cr);
vap->va_rdev = rdev;
- vap->va_uid = current_fsuid();
- vap->va_gid = current_fsgid();
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();
+ zpl_vap_init(vap, dir, dentry, mode | S_IFDIR, cr);
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;
int error;
- cr = (cred_t *)get_current_cred();
- error = -zfs_getattr(dentry->d_inode, stat, 0, cr);
- put_cred(cr);
+ error = -zfs_getattr_fast(dentry->d_inode, stat);
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);
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();
+ zpl_vap_init(vap, dir, dentry, S_IFLNK | S_IRWXUGO, cr);
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)
{
- (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
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 */
d_instantiate(dentry, ip);
out:
- put_cred(cr);
+ crfree(cr);
ASSERT3S(error, <=, 0);
return (error);
}
const struct inode_operations zpl_inode_operations = {
- .check_acl = NULL,
.create = zpl_create,
.link = zpl_link,
.unlink = zpl_unlink,
};
const struct inode_operations zpl_dir_inode_operations = {
- .check_acl = NULL,
.create = zpl_create,
.lookup = zpl_lookup,
.link = zpl_link,
.mknod = zpl_mknod,
.rename = zpl_rename,
.setattr = zpl_setattr,
+ .getattr = zpl_getattr,
+ .setxattr = generic_setxattr,
+ .getxattr = generic_getxattr,
+ .removexattr = generic_removexattr,
+ .listxattr = zpl_xattr_list,
};
const struct inode_operations zpl_symlink_inode_operations = {
- .check_acl = NULL,
.readlink = generic_readlink,
.follow_link = zpl_follow_link,
.put_link = zpl_put_link,
+ .setattr = zpl_setattr,
+ .getattr = zpl_getattr,
+ .setxattr = generic_setxattr,
+ .getxattr = generic_getxattr,
+ .removexattr = generic_removexattr,
+ .listxattr = zpl_xattr_list,
};
const struct inode_operations zpl_special_inode_operations = {
- .check_acl = NULL,
+ .setattr = zpl_setattr,
+ .getattr = zpl_getattr,
+ .setxattr = generic_setxattr,
+ .getxattr = generic_getxattr,
+ .removexattr = generic_removexattr,
+ .listxattr = zpl_xattr_list,
};