diff options
| author | Mark Brown <broonie@kernel.org> | 2022-02-09 14:32:59 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2022-02-09 14:32:59 +0000 |
| commit | 2cbfa2128662c6b841f68cd2fe54df199457e38a (patch) | |
| tree | 868184bca677f97fa7bb9f3dad5de2f39543d769 /fs/nfs/filelayout/filelayoutdev.c | |
| parent | c17756beacf4d0b21c0e877bcfe09af645129b4e (diff) | |
| parent | a0386bba70934d42f586eaf68b21d5eeaffa7bd0 (diff) | |
spi: make remove callback a void function
Merge series from Uwe Kleine-König <u.kleine-koenig@pengutronix.de>:
this series goal is to change the spi remove callback's return value to void.
After numerous patches nearly all drivers already return 0 unconditionally.
The four first patches in this series convert the remaining three drivers to
return 0, the final patch changes the remove prototype and converts all
implementers.
base-commit: 26291c54e111ff6ba87a164d85d4a4e134b7315c
Diffstat (limited to 'fs/nfs/filelayout/filelayoutdev.c')
| -rw-r--r-- | fs/nfs/filelayout/filelayoutdev.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/fs/nfs/filelayout/filelayoutdev.c b/fs/nfs/filelayout/filelayoutdev.c index 86c3f7e69ec4..acf4b88889dc 100644 --- a/fs/nfs/filelayout/filelayoutdev.c +++ b/fs/nfs/filelayout/filelayoutdev.c @@ -136,9 +136,7 @@ nfs4_fl_alloc_deviceid_node(struct nfs_server *server, struct pnfs_device *pdev, goto out_err_free_stripe_indices; } - dsaddr = kzalloc(sizeof(*dsaddr) + - (sizeof(struct nfs4_pnfs_ds *) * (num - 1)), - gfp_flags); + dsaddr = kzalloc(struct_size(dsaddr, ds_list, num), gfp_flags); if (!dsaddr) goto out_err_free_stripe_indices; |