summaryrefslogtreecommitdiff
path: root/fs/xfs/libxfs/xfs_defer.h
diff options
context:
space:
mode:
authorIngo Molnar <mingo@kernel.org>2016-09-08 15:05:16 +0300
committerIngo Molnar <mingo@kernel.org>2016-09-08 15:05:16 +0300
commit950d8381d915ee293a5b57f91e59dd8115684af1 (patch)
tree6a611a808da1e28c3db740ac9a54c01757af2e56 /fs/xfs/libxfs/xfs_defer.h
parent979515c5645830465739254abc1b1648ada41518 (diff)
parentd71f058617564750261b673ea9b3352382b9cde4 (diff)
downloadlinux-950d8381d915ee293a5b57f91e59dd8115684af1.tar.xz
Merge branch 'linus' into timers/core, to refresh the branch
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'fs/xfs/libxfs/xfs_defer.h')
-rw-r--r--fs/xfs/libxfs/xfs_defer.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/xfs/libxfs/xfs_defer.h b/fs/xfs/libxfs/xfs_defer.h
index cc3981c48296..e96533d178cf 100644
--- a/fs/xfs/libxfs/xfs_defer.h
+++ b/fs/xfs/libxfs/xfs_defer.h
@@ -30,8 +30,8 @@ struct xfs_defer_op_type;
struct xfs_defer_pending {
const struct xfs_defer_op_type *dfp_type; /* function pointers */
struct list_head dfp_list; /* pending items */
- bool dfp_committed; /* committed trans? */
void *dfp_intent; /* log intent item */
+ void *dfp_done; /* log done item */
struct list_head dfp_work; /* work items */
unsigned int dfp_count; /* # extent items */
};