Linux compat 2.6.39: security_inode_init_security()

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

diff --git a/module/zfs/zfs_znode.c b/module/zfs/zfs_znode.c
index 936b950..076161a 100644 (file)
--- a/module/zfs/zfs_znode.c
+++ b/module/zfs/zfs_znode.c
@@ -278,7 +278,7 @@ zfs_inode_destroy(struct inode *ip)
 static void
 zfs_inode_set_ops(zfs_sb_t *zsb, struct inode *ip)
 {
-       uint64_t rdev;
+       uint64_t rdev = 0;
 
        switch (ip->i_mode & S_IFMT) {
        case S_IFREG:
@@ -297,12 +297,16 @@ zfs_inode_set_ops(zfs_sb_t *zsb, struct inode *ip)
                ip->i_op = &zpl_symlink_inode_operations;
                break;
 
+       /*
+        * rdev is only stored in a SA only for device files.
+        */
        case S_IFCHR:
        case S_IFBLK:
-       case S_IFIFO:
-       case S_IFSOCK:
                VERIFY(sa_lookup(ITOZ(ip)->z_sa_hdl, SA_ZPL_RDEV(zsb),
                    &rdev, sizeof (rdev)) == 0);
+               /*FALLTHROUGH*/
+       case S_IFIFO:
+       case S_IFSOCK:
                init_special_inode(ip, ip->i_mode, rdev);
                ip->i_op = &zpl_special_inode_operations;
                break;
@@ -323,7 +327,7 @@ zfs_inode_set_ops(zfs_sb_t *zsb, struct inode *ip)
 static znode_t *
 zfs_znode_alloc(zfs_sb_t *zsb, dmu_buf_t *db, int blksz,
     dmu_object_type_t obj_type, uint64_t obj, sa_handle_t *hdl,
-    struct dentry *dentry)
+    struct dentry *dentry, struct inode *dip)
 {
        znode_t *zp;
        struct inode *ip;
@@ -379,8 +383,12 @@ zfs_znode_alloc(zfs_sb_t *zsb, dmu_buf_t *db, int blksz,
        if (insert_inode_locked(ip))
                goto error;
 
-       if (dentry)
+       if (dentry) {
+               if (zpl_xattr_security_init(ip, dip, &dentry->d_name))
+                       goto error;
+
                d_instantiate(dentry, ip);
+       }
 
        mutex_enter(&zsb->z_znodes_lock);
        list_insert_tail(&zsb->z_all_znodes, zp);
@@ -556,8 +564,7 @@ zfs_mknode(znode_t *dzp, vattr_t *vap, dmu_tx_t *tx, cred_t *cr,
                size = links = 0;
        }
 
-       if (S_ISBLK(vap->va_mode)  || S_ISCHR(vap->va_mode) ||
-           S_ISFIFO(vap->va_mode) || S_ISSOCK(vap->va_mode))
+       if (S_ISBLK(vap->va_mode) || S_ISCHR(vap->va_mode))
                rdev = vap->va_rdev;
 
        parent = dzp->z_id;
@@ -648,8 +655,7 @@ zfs_mknode(znode_t *dzp, vattr_t *vap, dmu_tx_t *tx, cred_t *cr,
                    &empty_xattr, 8);
        }
        if (obj_type == DMU_OT_ZNODE ||
-           (S_ISBLK(vap->va_mode)  || S_ISCHR(vap->va_mode) ||
-            S_ISFIFO(vap->va_mode) || S_ISSOCK(vap->va_mode))) {
+           (S_ISBLK(vap->va_mode) || S_ISCHR(vap->va_mode))) {
                SA_ADD_BULK_ATTR(sa_attrs, cnt, SA_ZPL_RDEV(zsb),
                    NULL, &rdev, 8);
        }
@@ -679,11 +685,9 @@ zfs_mknode(znode_t *dzp, vattr_t *vap, dmu_tx_t *tx, cred_t *cr,
 
        if (!(flag & IS_ROOT_NODE)) {
                *zpp = zfs_znode_alloc(zsb, db, 0, obj_type, obj, sa_hdl,
-                   vap->va_dentry);
+                   vap->va_dentry, ZTOI(dzp));
                ASSERT(*zpp != NULL);
                ASSERT(dzp != NULL);
-               err = zpl_xattr_security_init(ZTOI(*zpp), ZTOI(dzp));
-               ASSERT3S(err, ==, 0);
        } else {
                /*
                 * If we are creating the root node, the "parent" we
@@ -892,7 +896,7 @@ again:
         * bonus buffer.
         */
        zp = zfs_znode_alloc(zsb, db, doi.doi_data_block_size,
-           doi.doi_bonus_type, obj_num, NULL, NULL);
+           doi.doi_bonus_type, obj_num, NULL, NULL, NULL);
        if (zp == NULL) {
                err = ENOENT;
        } else {
@@ -1117,22 +1121,6 @@ zfs_grow_blocksize(znode_t *zp, uint64_t size, dmu_tx_t *tx)
        dmu_object_size_from_db(sa_get_db(zp->z_sa_hdl), &zp->z_blksz, &dummy);
 }
 
-#ifdef HAVE_MMAP
-/*
- * This is a dummy interface used when pvn_vplist_dirty() should *not*
- * be calling back into the fs for a putpage().  E.g.: when truncating
- * a file, the pages being "thrown away* don't need to be written out.
- */
-/* ARGSUSED */
-static int
-zfs_no_putpage(vnode_t *vp, page_t *pp, u_offset_t *offp, size_t *lenp,
-    int flags, cred_t *cr)
-{
-       ASSERT(0);
-       return (0);
-}
-#endif /* HAVE_MMAP */
-
 /*
  * Increase the file length
  *