Commit ca4f2589 authored by Carlos Maiolino's avatar Carlos Maiolino Committed by Darrick J. Wong

xfs: Modify xlog_ticket_alloc() to use kernel's MM API

xlog_ticket_alloc() is always called under NOFS context, except from
unmount path, which eitherway is holding many FS locks, so, there is no
need for its callers to keep passing allocation flags into it.

change xlog_ticket_alloc() to use default kmem_cache_zalloc(), remove
its alloc_flags argument, and always use GFP_NOFS | __GFP_NOFAIL flags.
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarCarlos Maiolino <cmaiolino@redhat.com>
Reviewed-by: default avatarDarrick J. Wong <darrick.wong@oracle.com>
Signed-off-by: default avatarDarrick J. Wong <darrick.wong@oracle.com>
Reviewed-by: default avatarDave Chinner <dchinner@redhat.com>
parent 32a2b11f
...@@ -433,7 +433,7 @@ xfs_log_reserve( ...@@ -433,7 +433,7 @@ xfs_log_reserve(
XFS_STATS_INC(mp, xs_try_logspace); XFS_STATS_INC(mp, xs_try_logspace);
ASSERT(*ticp == NULL); ASSERT(*ticp == NULL);
tic = xlog_ticket_alloc(log, unit_bytes, cnt, client, permanent, 0); tic = xlog_ticket_alloc(log, unit_bytes, cnt, client, permanent);
*ticp = tic; *ticp = tic;
xlog_grant_push_ail(log, tic->t_cnt ? tic->t_unit_res * tic->t_cnt xlog_grant_push_ail(log, tic->t_cnt ? tic->t_unit_res * tic->t_cnt
...@@ -3408,15 +3408,12 @@ xlog_ticket_alloc( ...@@ -3408,15 +3408,12 @@ xlog_ticket_alloc(
int unit_bytes, int unit_bytes,
int cnt, int cnt,
char client, char client,
bool permanent, bool permanent)
xfs_km_flags_t alloc_flags)
{ {
struct xlog_ticket *tic; struct xlog_ticket *tic;
int unit_res; int unit_res;
tic = kmem_zone_zalloc(xfs_log_ticket_zone, alloc_flags); tic = kmem_cache_zalloc(xfs_log_ticket_zone, GFP_NOFS | __GFP_NOFAIL);
if (!tic)
return NULL;
unit_res = xfs_log_calc_unit_res(log->l_mp, unit_bytes); unit_res = xfs_log_calc_unit_res(log->l_mp, unit_bytes);
......
...@@ -37,8 +37,7 @@ xlog_cil_ticket_alloc( ...@@ -37,8 +37,7 @@ xlog_cil_ticket_alloc(
{ {
struct xlog_ticket *tic; struct xlog_ticket *tic;
tic = xlog_ticket_alloc(log, 0, 1, XFS_TRANSACTION, 0, tic = xlog_ticket_alloc(log, 0, 1, XFS_TRANSACTION, 0);
KM_NOFS);
/* /*
* set the current reservation to zero so we know to steal the basic * set the current reservation to zero so we know to steal the basic
......
...@@ -464,9 +464,7 @@ xlog_ticket_alloc( ...@@ -464,9 +464,7 @@ xlog_ticket_alloc(
int unit_bytes, int unit_bytes,
int count, int count,
char client, char client,
bool permanent, bool permanent);
xfs_km_flags_t alloc_flags);
static inline void static inline void
xlog_write_adv_cnt(void **ptr, int *len, int *off, size_t bytes) xlog_write_adv_cnt(void **ptr, int *len, int *off, size_t bytes)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment