X-Git-Url: https://git.camperquake.de/gitweb.cgi?a=blobdiff_plain;f=module%2Fzfs%2Fzpl_inode.c;h=6175c2e93f8e4c2fe168f86a651a6764b3f8fc57;hb=e89260a1c8851ce05ea04b23606ba438b271d890;hp=b7227675b55493986a594882ba17a5691c67d1bc;hpb=5484965ab650a56871a62a3373859a7a36ddafcb;p=zfs.git diff --git a/module/zfs/zpl_inode.c b/module/zfs/zpl_inode.c index b722767..6175c2e 100644 --- a/module/zfs/zpl_inode.c +++ b/module/zfs/zpl_inode.c @@ -25,21 +25,26 @@ #include #include +#include #include #include static struct dentry * +#ifdef HAVE_LOOKUP_NAMEIDATA zpl_lookup(struct inode *dir, struct dentry *dentry, struct nameidata *nd) +#else +zpl_lookup(struct inode *dir, struct dentry *dentry, unsigned int flags) +#endif { + 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) @@ -51,61 +56,80 @@ zpl_lookup(struct inode *dir, struct dentry *dentry, struct nameidata *nd) return d_splice_alias(ip, dentry); } +void +zpl_vap_init(vattr_t *vap, struct inode *dir, struct dentry *dentry, + zpl_umode_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, +#ifdef HAVE_CREATE_NAMEIDATA +zpl_create(struct inode *dir, struct dentry *dentry, zpl_umode_t mode, struct nameidata *nd) +#else +zpl_create(struct inode *dir, struct dentry *dentry, zpl_umode_t mode, + bool flag) +#endif { - 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; + error = -zfs_create(dir, dname(dentry), vap, 0, mode, &ip, cr, 0, NULL); + if (error == 0) { + error = zpl_xattr_security_init(ip, dir, &dentry->d_name); + VERIFY3S(error, ==, 0); + } - d_instantiate(dentry, ip); -out: 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) +zpl_mknod(struct inode *dir, struct dentry *dentry, zpl_umode_t 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); @@ -114,40 +138,32 @@ 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); } static int -zpl_mkdir(struct inode *dir, struct dentry *dentry, int mode) +zpl_mkdir(struct inode *dir, struct dentry *dentry, zpl_umode_t 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); @@ -156,12 +172,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,35 +186,21 @@ zpl_rmdir(struct inode * dir, struct dentry *dentry) static int zpl_getattr(struct vfsmount *mnt, struct dentry *dentry, struct kstat *stat) { - cred_t *cr; - vattr_t *vap; - struct inode *ip; + boolean_t issnap = ITOZSB(dentry->d_inode)->z_issnap; int error; - ip = dentry->d_inode; - cr = (cred_t *)get_current_cred(); - 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 = 0; - 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)); - put_cred(cr); + /* + * Ensure MNT_SHRINKABLE is set on snapshots to ensure they are + * unmounted automatically with the parent file system. This + * is done on the first getattr because it's not easy to get the + * vfsmount structure at mount time. This call path is explicitly + * marked unlikely to avoid any performance impact. FWIW, ext4 + * resorts to a similar trick for sysadmin convenience. + */ + if (unlikely(issnap && !(mnt->mnt_flags & MNT_SHRINKABLE))) + mnt->mnt_flags |= MNT_SHRINKABLE; + + error = -zfs_getattr_fast(dentry->d_inode, stat); ASSERT3S(error, <=, 0); return (error); @@ -207,7 +209,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 +217,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 +231,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 +241,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,26 +255,18 @@ 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(); + 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); @@ -281,14 +275,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,16 +300,15 @@ zpl_follow_link(struct dentry *dentry, struct nameidata *nd) nd_set_link(nd, link); } - put_cred(cr); + crfree(cr); return (NULL); } static void zpl_put_link(struct dentry *dentry, struct nameidata *nd, void *ptr) { - char *link; + const char *link = nd_get_link(nd); - link = nd_get_link(nd); if (!IS_ERR(link)) kmem_free(link, MAXPATHLEN); } @@ -323,14 +316,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,12 +335,50 @@ 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); } +#ifdef HAVE_INODE_TRUNCATE_RANGE +static void +zpl_truncate_range(struct inode* ip, loff_t start, loff_t end) +{ + cred_t *cr = CRED(); + flock64_t bf; + + ASSERT3S(start, <=, end); + + /* + * zfs_freesp() will interpret (len == 0) as meaning "truncate until + * the end of the file". We don't want that. + */ + if (start == end) + return; + + crhold(cr); + + bf.l_type = F_WRLCK; + bf.l_whence = 0; + bf.l_start = start; + bf.l_len = end - start; + bf.l_pid = 0; + zfs_space(ip, F_FREESP, &bf, FWRITE, start, cr); + + crfree(cr); +} +#endif /* HAVE_INODE_TRUNCATE_RANGE */ + +#ifdef HAVE_INODE_FALLOCATE +static long +zpl_fallocate(struct inode *ip, int mode, loff_t offset, loff_t len) +{ + return zpl_fallocate_common(ip, mode, offset, len); +} +#endif /* HAVE_INODE_FALLOCATE */ + + const struct inode_operations zpl_inode_operations = { .create = zpl_create, .link = zpl_link, @@ -363,6 +394,12 @@ const struct inode_operations zpl_inode_operations = { .getxattr = generic_getxattr, .removexattr = generic_removexattr, .listxattr = zpl_xattr_list, +#ifdef HAVE_INODE_TRUNCATE_RANGE + .truncate_range = zpl_truncate_range, +#endif /* HAVE_INODE_TRUNCATE_RANGE */ +#ifdef HAVE_INODE_FALLOCATE + .fallocate = zpl_fallocate, +#endif /* HAVE_INODE_FALLOCATE */ }; const struct inode_operations zpl_dir_inode_operations = { @@ -387,6 +424,12 @@ const struct inode_operations zpl_symlink_inode_operations = { .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 = {