diff --git a/src/system/kernel/fs/vfs_tracing.h b/src/system/kernel/fs/vfs_tracing.h
index 2358a7c1fb..0de0489e7f 100644
--- a/src/system/kernel/fs/vfs_tracing.h
+++ b/src/system/kernel/fs/vfs_tracing.h
@@ -20,32 +20,20 @@
 namespace FileDescriptorTracing {
 
 
-class FDTraceEntry : public AbstractTraceEntry {
+class FDTraceEntry
+	: public TRACE_ENTRY_SELECTOR(FILE_DESCRIPTOR_TRACING_STACK_TRACE) {
 public:
 	FDTraceEntry(file_descriptor* descriptor)
 		:
+		TraceEntryBase(FILE_DESCRIPTOR_TRACING_STACK_TRACE, 0, true),
 		fDescriptor(descriptor),
 		fReferenceCount(descriptor->ref_count)
 	{
-#if FILE_DESCRIPTOR_TRACING_STACK_TRACE
-		fStackTrace = capture_tracing_stack_trace(
-			FILE_DESCRIPTOR_TRACING_STACK_TRACE, 0, false);
-#endif
 	}
 
-#if FILE_DESCRIPTOR_TRACING_STACK_TRACE
-	virtual void DumpStackTrace(TraceOutput& out)
-	{
-		out.PrintStackTrace(fStackTrace);
-	}
-#endif
-
 protected:
 	file_descriptor*		fDescriptor;
 	int32					fReferenceCount;
-#if FILE_DESCRIPTOR_TRACING_STACK_TRACE
-	tracing_stack_trace*	fStackTrace;
-#endif
 };