From: Dave Chinner <david@fromorbit.com>
To: xfs@oss.sgi.com
Subject: [PATCH 03/11] xfs: allow log ticket allocation to take allocation flags
Date: Thu, 6 May 2010 11:45:43 +1000 [thread overview]
Message-ID: <1273110351-2333-4-git-send-email-david@fromorbit.com> (raw)
In-Reply-To: <1273110351-2333-1-git-send-email-david@fromorbit.com>
From: Dave Chinner <dchinner@redhat.com>
Delayed logging currently requires ticket allocation to succeed, so
we need to be able to sleep on allocation. It also should not allow
memory allocation to recurse into the filesystem. hence we need to
pass allocation flags directing the type of allocation the caller
requires.
Signed-off-by: Dave Chinner <dchinner@redhat.com>
---
fs/xfs/xfs_log.c | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/fs/xfs/xfs_log.c b/fs/xfs/xfs_log.c
index 687b220..83be6a6 100644
--- a/fs/xfs/xfs_log.c
+++ b/fs/xfs/xfs_log.c
@@ -88,11 +88,9 @@ STATIC void xlog_ungrant_log_space(xlog_t *log,
/* local ticket functions */
-STATIC xlog_ticket_t *xlog_ticket_alloc(xlog_t *log,
- int unit_bytes,
- int count,
- char clientid,
- uint flags);
+STATIC xlog_ticket_t *xlog_ticket_alloc(xlog_t *log, int unit_bytes, int count,
+ char clientid, uint flags,
+ int alloc_flags);
#if defined(DEBUG)
STATIC void xlog_verify_dest_ptr(xlog_t *log, char *ptr);
@@ -376,7 +374,8 @@ xfs_log_reserve(
} else {
/* may sleep if need to allocate more tickets */
internal_ticket = xlog_ticket_alloc(log, unit_bytes, cnt,
- client, flags);
+ client, flags,
+ KM_SLEEP|KM_MAYFAIL);
if (!internal_ticket)
return XFS_ERROR(ENOMEM);
internal_ticket->t_trans_type = t_type;
@@ -3331,13 +3330,14 @@ xlog_ticket_alloc(
int unit_bytes,
int cnt,
char client,
- uint xflags)
+ uint xflags,
+ int alloc_flags)
{
struct xlog_ticket *tic;
uint num_headers;
int iclog_space;
- tic = kmem_zone_zalloc(xfs_log_ticket_zone, KM_SLEEP|KM_MAYFAIL);
+ tic = kmem_zone_zalloc(xfs_log_ticket_zone, alloc_flags);
if (!tic)
return NULL;
--
1.5.6.5
_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs
next prev parent reply other threads:[~2010-05-06 1:43 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-05-06 1:45 [PATCH 0/11] xfs: delayed logging Dave Chinner
2010-05-06 1:45 ` [PATCH 01/11] xfs: Don't reuse the same transaciton ID for duplicated transactions Dave Chinner
2010-05-06 20:41 ` Christoph Hellwig
2010-05-06 1:45 ` [PATCH 02/11] xfs: Improve scalability of busy extent tracking Dave Chinner
2010-05-06 1:45 ` Dave Chinner [this message]
2010-05-06 20:43 ` [PATCH 03/11] xfs: allow log ticket allocation to take allocation flags Christoph Hellwig
2010-05-06 1:45 ` [PATCH 04/11] xfs: modify buffer item reference counting V2 Dave Chinner
2010-05-06 21:00 ` Christoph Hellwig
2010-05-06 1:45 ` [PATCH 05/11] xfs: Clean up XFS_BLI_* flag namespace Dave Chinner
2010-05-06 20:51 ` Christoph Hellwig
2010-05-06 1:45 ` [PATCH 06/11] xfs: clean up log ticket overrun debug output Dave Chinner
2010-05-06 20:50 ` Christoph Hellwig
2010-05-06 1:45 ` [PATCH 07/11] xfs: Delayed logging design documentation Dave Chinner
2010-05-06 1:45 ` [PATCH 08/11] xfs: Introduce delayed logging core code Dave Chinner
2010-05-06 1:45 ` [PATCH 09/11] xfs: forced unmounts need to push the CIL Dave Chinner
2010-05-06 1:45 ` [PATCH 10/11] xfs: enable background pushing of " Dave Chinner
2010-05-06 1:45 ` [PATCH 11/11] xfs: Ensure inode allocation buffers are fully replayed Dave Chinner
2010-05-06 13:26 ` [PATCH 0/11] xfs: delayed logging Dave Chinner
2010-05-06 19:12 ` Christoph Hellwig
2010-05-06 23:54 ` Dave Chinner
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1273110351-2333-4-git-send-email-david@fromorbit.com \
--to=david@fromorbit.com \
--cc=xfs@oss.sgi.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox