Linux 3.8 compat: Support CONFIG_UIDGID_STRICT_TYPE_CHECKS

[zfs.git] / module / zfs / zpl_inode.c

diff --git a/module/zfs/zpl_inode.c b/module/zfs/zpl_inode.c
index 0dab82c..ab1fe68 100644 (file)
--- a/module/zfs/zpl_inode.c
+++ b/module/zfs/zpl_inode.c
@@ -31,17 +31,31 @@
 
 
 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;
        int error;
 
+       if (dlen(dentry) > ZFS_MAXNAMELEN)
+               return ERR_PTR(-ENAMETOOLONG);
+
        crhold(cr);
        error = -zfs_lookup(dir, dname(dentry), &ip, 0, cr, NULL, NULL);
        ASSERT3S(error, <=, 0);
        crfree(cr);
 
+       spin_lock(&dentry->d_lock);
+       dentry->d_time = jiffies;
+#ifndef HAVE_S_D_OP
+       d_set_d_op(dentry, &zpl_dentry_operations);
+#endif /* HAVE_S_D_OP */
+       spin_unlock(&dentry->d_lock);
+
        if (error) {
                if (error == -ENOENT)
                        return d_splice_alias(NULL, dentry);
@@ -53,16 +67,14 @@ zpl_lookup(struct inode *dir, struct dentry *dentry, struct nameidata *nd)
 }
 
 void
-zpl_vap_init(vattr_t *vap, struct inode *dir, struct dentry *dentry,
-    zpl_umode_t mode, cred_t *cr)
+zpl_vap_init(vattr_t *vap, struct inode *dir, 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;
+               vap->va_gid = KGID_TO_SGID(dir->i_gid);
                if (S_ISDIR(mode))
                        vap->va_mode |= S_ISGID;
        } else {
@@ -71,8 +83,13 @@ zpl_vap_init(vattr_t *vap, struct inode *dir, struct dentry *dentry,
 }
 
 static int
+#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
 {
        cred_t *cr = CRED();
        struct inode *ip;
@@ -81,10 +98,15 @@ zpl_create(struct inode *dir, struct dentry *dentry, zpl_umode_t mode,
 
        crhold(cr);
        vap = kmem_zalloc(sizeof(vattr_t), KM_SLEEP);
-       zpl_vap_init(vap, dir, dentry, mode, cr);
+       zpl_vap_init(vap, dir, mode, cr);
+
+       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);
+       }
 
-       error = -zfs_create(dir, (char *)dentry->d_name.name,
-           vap, 0, mode, &ip, cr, 0, NULL);
        kmem_free(vap, sizeof(vattr_t));
        crfree(cr);
        ASSERT3S(error, <=, 0);
@@ -110,11 +132,13 @@ zpl_mknod(struct inode *dir, struct dentry *dentry, zpl_umode_t mode,
 
        crhold(cr);
        vap = kmem_zalloc(sizeof(vattr_t), KM_SLEEP);
-       zpl_vap_init(vap, dir, dentry, mode, cr);
+       zpl_vap_init(vap, dir, mode, cr);
        vap->va_rdev = rdev;
 
-       error = -zfs_create(dir, (char *)dentry->d_name.name,
-           vap, 0, mode, &ip, cr, 0, NULL);
+       error = -zfs_create(dir, dname(dentry), vap, 0, mode, &ip, cr, 0, NULL);
+       if (error == 0)
+               d_instantiate(dentry, ip);
+
        kmem_free(vap, sizeof(vattr_t));
        crfree(cr);
        ASSERT3S(error, <=, 0);
@@ -146,9 +170,12 @@ zpl_mkdir(struct inode *dir, struct dentry *dentry, zpl_umode_t mode)
 
        crhold(cr);
        vap = kmem_zalloc(sizeof(vattr_t), KM_SLEEP);
-       zpl_vap_init(vap, dir, dentry, mode | S_IFDIR, cr);
+       zpl_vap_init(vap, dir, mode | S_IFDIR, cr);
 
        error = -zfs_mkdir(dir, dname(dentry), vap, &ip, cr, 0, NULL);
+       if (error == 0)
+               d_instantiate(dentry, ip);
+
        kmem_free(vap, sizeof(vattr_t));
        crfree(cr);
        ASSERT3S(error, <=, 0);
@@ -208,8 +235,8 @@ zpl_setattr(struct dentry *dentry, struct iattr *ia)
        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_uid = KUID_TO_SUID(ia->ia_uid);
+       vap->va_gid = KGID_TO_SGID(ia->ia_gid);
        vap->va_size = ia->ia_size;
        vap->va_atime = ia->ia_atime;
        vap->va_mtime = ia->ia_mtime;
@@ -249,9 +276,12 @@ zpl_symlink(struct inode *dir, struct dentry *dentry, const char *name)
 
        crhold(cr);
        vap = kmem_zalloc(sizeof(vattr_t), KM_SLEEP);
-       zpl_vap_init(vap, dir, dentry, S_IFLNK | S_IRWXUGO, cr);
+       zpl_vap_init(vap, dir, S_IFLNK | S_IRWXUGO, cr);
 
        error = -zfs_symlink(dir, dname(dentry), vap, (char *)name, &ip, cr, 0);
+       if (error == 0)
+               d_instantiate(dentry, ip);
+
        kmem_free(vap, sizeof(vattr_t));
        crfree(cr);
        ASSERT3S(error, <=, 0);
@@ -365,6 +395,44 @@ zpl_fallocate(struct inode *ip, int mode, loff_t offset, loff_t len)
 }
 #endif /* HAVE_INODE_FALLOCATE */
 
+static int
+#ifdef HAVE_D_REVALIDATE_NAMEIDATA
+zpl_revalidate(struct dentry *dentry, struct nameidata *nd)
+{
+       unsigned int flags = (nd ? nd->flags : 0);
+#else
+zpl_revalidate(struct dentry *dentry, unsigned int flags)
+{
+#endif /* HAVE_D_REVALIDATE_NAMEIDATA */
+       zfs_sb_t *zsb = dentry->d_sb->s_fs_info;
+       int error;
+
+       if (flags & LOOKUP_RCU)
+               return (-ECHILD);
+
+       /*
+        * After a rollback negative dentries created before the rollback
+        * time must be invalidated.  Otherwise they can obscure files which
+        * are only present in the rolled back dataset.
+        */
+       if (dentry->d_inode == NULL) {
+               spin_lock(&dentry->d_lock);
+               error = time_before(dentry->d_time, zsb->z_rollback_time);
+               spin_unlock(&dentry->d_lock);
+
+               if (error)
+                       return (0);
+       }
+
+       /*
+        * The dentry may reference a stale inode if a mounted file system
+        * was rolled back to a point in time where the object didn't exist.
+        */
+       if (dentry->d_inode && ITOZ(dentry->d_inode)->z_is_stale)
+               return (0);
+
+       return (1);
+}
 
 const struct inode_operations zpl_inode_operations = {
        .create         = zpl_create,
@@ -427,3 +495,7 @@ const struct inode_operations zpl_special_inode_operations = {
        .removexattr    = generic_removexattr,
        .listxattr      = zpl_xattr_list,
 };
+
+dentry_operations_t zpl_dentry_operations = {
+       .d_revalidate   = zpl_revalidate,
+};