diff --git a/[refs] b/[refs] index 97d7a4a7f1e1..3a05052b5a9c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 18cf8cf8bab1296f477ee4dd8f78b5b23c5a192e +refs/heads/master: 4cd9069a0a0e5fb8b007425c937642682ac96c76 diff --git a/trunk/include/linux/writeback.h b/trunk/include/linux/writeback.h index a2b84f598e2b..3309736ff059 100644 --- a/trunk/include/linux/writeback.h +++ b/trunk/include/linux/writeback.h @@ -58,7 +58,6 @@ extern const char *wb_reason_name[]; * in a manner such that unspecified fields are set to zero. */ struct writeback_control { - enum writeback_sync_modes sync_mode; long nr_to_write; /* Write this many pages, and decrement this for each page written */ long pages_skipped; /* Pages which were not written */ @@ -71,6 +70,8 @@ struct writeback_control { loff_t range_start; loff_t range_end; + enum writeback_sync_modes sync_mode; + unsigned for_kupdate:1; /* A kupdate writeback */ unsigned for_background:1; /* A background writeback */ unsigned tagged_writepages:1; /* tag-and-write to avoid livelock */