From f69b9384015622fe9d33a129464532061a6150ba Mon Sep 17 00:00:00 2001
From: Michael Davidsaver <mdavidsaver@gmail.com>
Date: Mon, 8 Mar 2021 14:28:15 -0800
Subject: [PATCH] dbfl_type_rec goes away

---
 modules/database/src/ioc/db/dbAccess.c  | 4 ++--
 modules/database/src/std/filters/utag.c | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/modules/database/src/ioc/db/dbAccess.c b/modules/database/src/ioc/db/dbAccess.c
index 65deba6d6..91093b546 100644
--- a/modules/database/src/ioc/db/dbAccess.c
+++ b/modules/database/src/ioc/db/dbAccess.c
@@ -361,7 +361,7 @@ static void getOptions(DBADDR *paddr, char **poriginal, long *options,
             pbuffer = (char *)pushort;
         }
         if( (*options) & DBR_AMSG ) {
-            if (!pfl || pfl->type == dbfl_type_rec) {
+            if (!pfl) {
                 STATIC_ASSERT(sizeof(pcommon->amsg)==sizeof(pfl->amsg));
                 strncpy(pbuffer, pcommon->amsg, sizeof(pcommon->amsg)-1);
             } else {
@@ -404,7 +404,7 @@ static void getOptions(DBADDR *paddr, char **poriginal, long *options,
         }
         if( (*options) & DBR_UTAG ) {
             epicsUInt64 *ptag = (epicsUInt64*)pbuffer;
-            if (!pfl || pfl->type == dbfl_type_rec) {
+            if (!pfl) {
                 *ptag++ = pcommon->utag;
             } else {
                 *ptag++ = pfl->utag;
diff --git a/modules/database/src/std/filters/utag.c b/modules/database/src/std/filters/utag.c
index 21faa097c..b17f3e8a0 100644
--- a/modules/database/src/std/filters/utag.c
+++ b/modules/database/src/std/filters/utag.c
@@ -47,7 +47,7 @@ static int parse_ok(void *raw)
 static db_field_log* filter(void* raw, dbChannel *chan, db_field_log *pfl)
 {
     utagPvt *pvt = (utagPvt*)raw;
-    epicsUTag utag = pfl->type==dbfl_type_rec ? dbChannelRecord(chan)->utag : pfl->utag;
+    epicsUTag utag = pfl->utag;
     int drop = (utag&pvt->mask)!=pvt->value;
 
     if(pfl->ctx!=dbfl_context_event || pfl->mask&DBE_PROPERTY) {