diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2024-03-22 11:12:21 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2024-03-22 11:12:21 -0700 |
| commit | 6f6efce52d3a035b8332969ecf254b4dfc62e4ec (patch) | |
| tree | ad078590e54b22f16e18378fb03aadd4acb6f5ed /fs/xfs/xfs_buf_mem.c | |
| parent | c150b809f7de2afdd3fb5a9adff2a9a68d7331ce (diff) | |
| parent | 0c6ca06aad84bac097f5c005d911db92dba3ae94 (diff) | |
| download | linux-6f6efce52d3a035b8332969ecf254b4dfc62e4ec.tar.gz | |
Merge tag 'xfs-6.9-merge-9' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux
Pull xfs fixes from Chandan Babu:
- Fix invalid pointer dereference by initializing xmbuf before
tracepoint function is invoked
- Use memalloc_nofs_save() when inserting into quota radix tree
* tag 'xfs-6.9-merge-9' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux:
xfs: quota radix tree allocations need to be NOFS on insert
xfs: fix dev_t usage in xmbuf tracepoints
Diffstat (limited to 'fs/xfs/xfs_buf_mem.c')
| -rw-r--r-- | fs/xfs/xfs_buf_mem.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/xfs/xfs_buf_mem.c b/fs/xfs/xfs_buf_mem.c index 8ad38c64708ec5..9bb2d24de70941 100644 --- a/fs/xfs/xfs_buf_mem.c +++ b/fs/xfs/xfs_buf_mem.c @@ -81,8 +81,6 @@ xmbuf_alloc( /* ensure all writes are below EOF to avoid pagecache zeroing */ i_size_write(inode, inode->i_sb->s_maxbytes); - trace_xmbuf_create(btp); - error = xfs_buf_cache_init(btp->bt_cache); if (error) goto out_file; @@ -99,6 +97,8 @@ xmbuf_alloc( if (error) goto out_bcache; + trace_xmbuf_create(btp); + *btpp = btp; return 0; |