writeback: remove writeback_control.more_io

[mirror_ubuntu-artful-kernel.git] / include / linux / writeback.h

diff --git a/include/linux/writeback.h b/include/linux/writeback.h
index 17e7ccc322a50452736b0b43ad33d250ee1a00e3..8797b20dd22b2adae7e5a1960f395b729b0ec75e 100644 (file)
--- a/include/linux/writeback.h
+++ b/include/linux/writeback.h
@@ -9,8 +9,6 @@
 
 struct backing_dev_info;
 
-extern spinlock_t inode_wb_list_lock;
-
 /*
  * fs/fs-writeback.c
  */
@@ -28,12 +26,10 @@ struct writeback_control {
        enum writeback_sync_modes sync_mode;
        unsigned long *older_than_this; /* If !NULL, only write back inodes
                                           older than this */
-       unsigned long wb_start;         /* Time writeback_inodes_wb was
-                                          called. This is needed to avoid
-                                          extra jobs and livelock */
        long nr_to_write;               /* Write this many pages, and decrement
                                           this for each page written */
        long pages_skipped;             /* Pages which were not written */
+       long inodes_written;            /* # of inodes written (at least) */
 
        /*
         * For a_ops->writepages(): is start or end are non-zero then this is
@@ -47,9 +43,9 @@ struct writeback_control {
        unsigned encountered_congestion:1; /* An output: a queue is full */
        unsigned for_kupdate:1;         /* A kupdate writeback */
        unsigned for_background:1;      /* A background writeback */
+       unsigned tagged_writepages:1;   /* tag-and-write to avoid livelock */
        unsigned for_reclaim:1;         /* Invoked from the page allocator */
        unsigned range_cyclic:1;        /* range_start is cyclic */
-       unsigned more_io:1;             /* more io to be dispatched */
 };
 
 /*