diff options
Diffstat (limited to 'include/linux/nilfs2_fs.h')
-rw-r--r-- | include/linux/nilfs2_fs.h | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/include/linux/nilfs2_fs.h b/include/linux/nilfs2_fs.h index 306c446e694e..aa93f0ee29d4 100644 --- a/include/linux/nilfs2_fs.h +++ b/include/linux/nilfs2_fs.h | |||
@@ -565,8 +565,6 @@ enum { | |||
565 | NILFS_SEGMENT_USAGE_DIRTY, | 565 | NILFS_SEGMENT_USAGE_DIRTY, |
566 | NILFS_SEGMENT_USAGE_ERROR, | 566 | NILFS_SEGMENT_USAGE_ERROR, |
567 | 567 | ||
568 | /* on-memory only */ | ||
569 | NILFS_SEGMENT_USAGE_VOLATILE_ACTIVE, | ||
570 | /* ... */ | 568 | /* ... */ |
571 | }; | 569 | }; |
572 | 570 | ||
@@ -594,7 +592,6 @@ nilfs_segment_usage_##name(const struct nilfs_segment_usage *su) \ | |||
594 | NILFS_SEGMENT_USAGE_FNS(ACTIVE, active) | 592 | NILFS_SEGMENT_USAGE_FNS(ACTIVE, active) |
595 | NILFS_SEGMENT_USAGE_FNS(DIRTY, dirty) | 593 | NILFS_SEGMENT_USAGE_FNS(DIRTY, dirty) |
596 | NILFS_SEGMENT_USAGE_FNS(ERROR, error) | 594 | NILFS_SEGMENT_USAGE_FNS(ERROR, error) |
597 | NILFS_SEGMENT_USAGE_FNS(VOLATILE_ACTIVE, volatile_active) | ||
598 | 595 | ||
599 | static inline void | 596 | static inline void |
600 | nilfs_segment_usage_set_clean(struct nilfs_segment_usage *su) | 597 | nilfs_segment_usage_set_clean(struct nilfs_segment_usage *su) |
@@ -650,7 +647,6 @@ nilfs_suinfo_##name(const struct nilfs_suinfo *si) \ | |||
650 | NILFS_SUINFO_FNS(ACTIVE, active) | 647 | NILFS_SUINFO_FNS(ACTIVE, active) |
651 | NILFS_SUINFO_FNS(DIRTY, dirty) | 648 | NILFS_SUINFO_FNS(DIRTY, dirty) |
652 | NILFS_SUINFO_FNS(ERROR, error) | 649 | NILFS_SUINFO_FNS(ERROR, error) |
653 | NILFS_SUINFO_FNS(VOLATILE_ACTIVE, volatile_active) | ||
654 | 650 | ||
655 | static inline int nilfs_suinfo_clean(const struct nilfs_suinfo *si) | 651 | static inline int nilfs_suinfo_clean(const struct nilfs_suinfo *si) |
656 | { | 652 | { |
@@ -717,8 +713,9 @@ struct nilfs_cpstat { | |||
717 | * @ss_nsegs: number of segments | 713 | * @ss_nsegs: number of segments |
718 | * @ss_ncleansegs: number of clean segments | 714 | * @ss_ncleansegs: number of clean segments |
719 | * @ss_ndirtysegs: number of dirty segments | 715 | * @ss_ndirtysegs: number of dirty segments |
720 | * @ss_ctime: | 716 | * @ss_ctime: creation time of the last segment |
721 | * @ss_nongc_ctime: | 717 | * @ss_nongc_ctime: creation time of the last segment not for GC |
718 | * @ss_prot_seq: least sequence number of segments which must not be reclaimed | ||
722 | */ | 719 | */ |
723 | struct nilfs_sustat { | 720 | struct nilfs_sustat { |
724 | __u64 ss_nsegs; | 721 | __u64 ss_nsegs; |
@@ -726,6 +723,7 @@ struct nilfs_sustat { | |||
726 | __u64 ss_ndirtysegs; | 723 | __u64 ss_ndirtysegs; |
727 | __u64 ss_ctime; | 724 | __u64 ss_ctime; |
728 | __u64 ss_nongc_ctime; | 725 | __u64 ss_nongc_ctime; |
726 | __u64 ss_prot_seq; | ||
729 | }; | 727 | }; |
730 | 728 | ||
731 | /** | 729 | /** |