projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'topic/oxygen' into to-push
[firefly-linux-kernel-4.4.55.git]
/
fs
/
xfs
/
xfs_filestream.c
diff --git
a/fs/xfs/xfs_filestream.c
b/fs/xfs/xfs_filestream.c
index c38fd14fca29c7821001d6eca11df641b466908a..f3bb75da384e0919d30b6ba4722875ffe5736da3 100644
(file)
--- a/
fs/xfs/xfs_filestream.c
+++ b/
fs/xfs/xfs_filestream.c
@@
-400,7
+400,7
@@
xfs_filestream_init(void)
if (!item_zone)
return -ENOMEM;
#ifdef XFS_FILESTREAMS_TRACE
- xfs_filestreams_trace_buf = ktrace_alloc(XFS_FSTRM_KTRACE_SIZE, KM_
SLEEP
);
+ xfs_filestreams_trace_buf = ktrace_alloc(XFS_FSTRM_KTRACE_SIZE, KM_
NOFS
);
#endif
return 0;
}