Retire legacy debugging infrastructure

[mirror_spl.git] / module / spl / spl-kobj.c

diff --git a/module/spl/spl-kobj.c b/module/spl/spl-kobj.c
index f14f47f5d8481a3bc78fc7716204087e5f297a2f..5b29fdb58bee9c96ca7aec6efb1a88bc8c6629cd 100644 (file)
--- a/module/spl/spl-kobj.c
+++ b/module/spl/spl-kobj.c
@@ -25,13 +25,6 @@
 \*****************************************************************************/
 
 #include <sys/kobj.h>
-#include <spl-debug.h>
-
-#ifdef SS_DEBUG_SUBSYS
-#undef SS_DEBUG_SUBSYS
-#endif
-
-#define SS_DEBUG_SUBSYS SS_KOBJ
 
 struct _buf *
 kobj_open_file(const char *name)
@@ -39,38 +32,34 @@ kobj_open_file(const char *name)
        struct _buf *file;
        vnode_t *vp;
        int rc;
-       SENTRY;
 
        file = kmalloc(sizeof(_buf_t), GFP_KERNEL);
        if (file == NULL)
-               SRETURN((_buf_t *)-1UL);
+               return ((_buf_t *)-1UL);
 
        if ((rc = vn_open(name, UIO_SYSSPACE, FREAD, 0644, &vp, 0, 0))) {
                kfree(file);
-               SRETURN((_buf_t *)-1UL);
+               return ((_buf_t *)-1UL);
        }
 
        file->vp = vp;
 
-       SRETURN(file);
+       return (file);
 } /* kobj_open_file() */
 EXPORT_SYMBOL(kobj_open_file);
 
 void
 kobj_close_file(struct _buf *file)
 {
-       SENTRY;
        VOP_CLOSE(file->vp, 0, 0, 0, 0, 0);
         kfree(file);
-        SEXIT;
 } /* kobj_close_file() */
 EXPORT_SYMBOL(kobj_close_file);
 
 int
 kobj_read_file(struct _buf *file, char *buf, ssize_t size, offset_t off)
 {
-       SENTRY;
-       SRETURN(vn_rdwr(UIO_READ, file->vp, buf, size, off,
+       return (vn_rdwr(UIO_READ, file->vp, buf, size, off,
               UIO_SYSSPACE, 0, RLIM64_INFINITY, 0, NULL));
 } /* kobj_read_file() */
 EXPORT_SYMBOL(kobj_read_file);
@@ -80,14 +69,13 @@ kobj_get_filesize(struct _buf *file, uint64_t *size)
 {
         vattr_t vap;
        int rc;
-       SENTRY;
 
        rc = VOP_GETATTR(file->vp, &vap, 0, 0, NULL);
        if (rc)
-               SRETURN(rc);
+               return (rc);
 
         *size = vap.va_size;
 
-        SRETURN(rc);
+        return (rc);
 } /* kobj_get_filesize() */
 EXPORT_SYMBOL(kobj_get_filesize);