diff options
| author | Jakub Kicinski <[email protected]> | 2022-11-11 01:43:53 +0000 |
|---|---|---|
| committer | Jakub Kicinski <[email protected]> | 2022-11-11 01:43:53 +0000 |
| commit | 966a9b49033b472dcfb453abdc34bca7df17adce (patch) | |
| tree | c47919dd0be3db0d04bb272e39eee209de355eac /fs/xfs/xfs_error.c | |
| parent | genetlink: fix single op policy dump when do is present (diff) | |
| parent | Merge tag 'net-6.1-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/netd... (diff) | |
| download | kernel-966a9b49033b472dcfb453abdc34bca7df17adce.tar.gz kernel-966a9b49033b472dcfb453abdc34bca7df17adce.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
drivers/net/can/pch_can.c
ae64438be192 ("can: dev: fix skb drop check")
1dd1b521be85 ("can: remove obsolete PCH CAN driver")
https://lore.kernel.org/all/[email protected]/
Signed-off-by: Jakub Kicinski <[email protected]>
Diffstat (limited to 'fs/xfs/xfs_error.c')
| -rw-r--r-- | fs/xfs/xfs_error.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/fs/xfs/xfs_error.c b/fs/xfs/xfs_error.c index 7db588ed0be5..c6b2aabd6f18 100644 --- a/fs/xfs/xfs_error.c +++ b/fs/xfs/xfs_error.c @@ -234,13 +234,18 @@ int xfs_errortag_init( struct xfs_mount *mp) { + int ret; + mp->m_errortag = kmem_zalloc(sizeof(unsigned int) * XFS_ERRTAG_MAX, KM_MAYFAIL); if (!mp->m_errortag) return -ENOMEM; - return xfs_sysfs_init(&mp->m_errortag_kobj, &xfs_errortag_ktype, - &mp->m_kobj, "errortag"); + ret = xfs_sysfs_init(&mp->m_errortag_kobj, &xfs_errortag_ktype, + &mp->m_kobj, "errortag"); + if (ret) + kmem_free(mp->m_errortag); + return ret; } void |