Merge tag 'fixes-nc-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm...

[karo-tx-linux.git] / drivers / staging / lustre / lustre / osc / osc_cl_internal.h

diff --git a/drivers/staging/lustre/lustre/osc/osc_cl_internal.h b/drivers/staging/lustre/lustre/osc/osc_cl_internal.h
index 158e8fff838f4666d5f7c30cf3780376e79fa5d4..a3aa9b6596efc2f5ad83bce6983f777a9efeff46 100644 (file)
--- a/drivers/staging/lustre/lustre/osc/osc_cl_internal.h
+++ b/drivers/staging/lustre/lustre/osc/osc_cl_internal.h
@@ -374,7 +374,7 @@ struct osc_page {
        /**
         * Thread that submitted this page for transfer. For debugging.
         */
-       task_t     *ops_submitter;
+       struct task_struct      *ops_submitter;
        /**
         * Submit time - the time when the page is starting RPC. For debugging.
         */
@@ -660,7 +660,7 @@ struct osc_extent {
        /** lock covering this extent */
        struct cl_lock    *oe_osclock;
        /** terminator of this extent. Must be true if this extent is in IO. */
-       task_t  *oe_owner;
+       struct task_struct      *oe_owner;
        /** return value of writeback. If somebody is waiting for this extent,
         * this value can be known by outside world. */
        int             oe_rc;