Merge tag 'vfio-v5.12-rc4' of git://github.com/awilliam/linux-vfio

[linux-2.6-microblaze.git] / fs / xfs / xfs_log_cil.c

diff --git a/fs/xfs/xfs_log_cil.c b/fs/xfs/xfs_log_cil.c
index 9ed9036..b0ef071 100644 (file)
--- a/fs/xfs/xfs_log_cil.c
+++ b/fs/xfs/xfs_log_cil.c
@@ -37,8 +37,7 @@ xlog_cil_ticket_alloc(
 {
        struct xlog_ticket *tic;
 
-       tic = xlog_ticket_alloc(log, 0, 1, XFS_TRANSACTION, 0,
-                               KM_NOFS);
+       tic = xlog_ticket_alloc(log, 0, 1, XFS_TRANSACTION, 0);
 
        /*
         * set the current reservation to zero so we know to steal the basic
@@ -240,7 +239,7 @@ xfs_cil_prepare_item(
         * this CIL context and so we need to pin it. If we are replacing the
         * old_lv, then remove the space it accounts for and make it the shadow
         * buffer for later freeing. In both cases we are now switching to the
-        * shadow buffer, so update the the pointer to it appropriately.
+        * shadow buffer, so update the pointer to it appropriately.
         */
        if (!old_lv) {
                if (lv->lv_item->li_ops->iop_pin)