[XFS] Prevent log ktrace code from sleeping in an invalid context.

SGI Modid: 2.5.x-xfs:slinx:162768a

[XFS] Prevent log ktrace code from sleeping in an invalid context.
SGI Modid: 2.5.x-xfs:slinx:162768a
0d39ce1f · Nathan Scott · 5e6ff38f · 0d39ce1f
Commit 0d39ce1f authored Jan 10, 2004 by Nathan Scott
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 2 deletions

fs/xfs/xfs_log.c fs/xfs/xfs_log.c +5 -2

No files found.
--- a/fs/xfs/xfs_log.c
+++ b/fs/xfs/xfs_log.c
@@ -163,8 +163,11 @@ xfs_buftarg_t *xlog_target;
 void
 xlog_trace_loggrant(xlog_t *log, xlog_ticket_t *tic, xfs_caddr_t string)
 {
-	if (! log->l_grant_trace)
+	if (! log->l_grant_trace) {
-		log->l_grant_trace = ktrace_alloc(1024, KM_SLEEP);
+		log->l_grant_trace = ktrace_alloc(1024, KM_NOSLEEP);
+		if (! log->l_grant_trace)
+			return;
+	}
 	ktrace_enter(log->l_grant_trace,
 		     (void *)tic,