From: Greg KH <gregkh@suse.de>
To: linux-kernel@vger.kernel.org, stable@kernel.org
Cc: Justin Forbes <jmforbes@linuxtx.org>,
Zwane Mwaikambo <zwane@arm.linux.org.uk>,
"Theodore Ts'o" <tytso@mit.edu>,
Randy Dunlap <rdunlap@xenotime.net>,
Dave Jones <davej@redhat.com>,
Chuck Wolber <chuckw@quantumlinux.com>,
Chris Wedgwood <reviews@ml.cw.f00f.org>,
Michael Krufky <mkrufky@linuxtv.org>,
Chuck Ebbert <cebbert@redhat.com>,
Domenico Andreoli <cavokz@gmail.com>, Willy Tarreau <w@1wt.eu>,
Rodrigo Rubira Branco <rbranco@la.checkpoint.com>,
Jake Edge <jake@lwn.net>, Eugene Teo <eteo@redhat.com>,
torvalds@linux-foundation.org, akpm@linux-foundation.org,
alan@lxorguk.ukuu.org.uk, Nick Piggin <npiggin@suse.de>
Subject: [patch 40/40] fs: sys_sync fix
Date: Thu, 22 Jan 2009 22:15:01 -0800 [thread overview]
Message-ID: <20090123061501.GN2922@kroah.com> (raw)
In-Reply-To: <20090123001908.GA7397@kroah.com>
[-- Attachment #1: fs-sys_sync-fix.patch --]
[-- Type: text/plain, Size: 2100 bytes --]
2.6.27-stable review patch. If anyone has any objections, please let us know.
------------------
From: Nick Piggin <npiggin@suse.de>
commit 856bf4d717feb8c55d4e2f817b71ebb70cfbc67b upstream.
s_syncing livelock avoidance was breaking data integrity guarantee of
sys_sync, by allowing sys_sync to skip writing or waiting for superblocks
if there is a concurrent sys_sync happening.
This livelock avoidance is much less important now that we don't have the
get_super_to_sync() call after every sb that we sync. This was replaced
by __put_super_and_need_restart.
Signed-off-by: Nick Piggin <npiggin@suse.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---
fs/fs-writeback.c | 20 +-------------------
include/linux/fs.h | 1 -
2 files changed, 1 insertion(+), 20 deletions(-)
--- a/fs/fs-writeback.c
+++ b/fs/fs-writeback.c
@@ -652,18 +652,6 @@ void sync_inodes_sb(struct super_block *
sync_sb_inodes(sb, &wbc);
}
-/*
- * Rather lame livelock avoidance.
- */
-static void set_sb_syncing(int val)
-{
- struct super_block *sb;
- spin_lock(&sb_lock);
- list_for_each_entry_reverse(sb, &super_blocks, s_list)
- sb->s_syncing = val;
- spin_unlock(&sb_lock);
-}
-
/**
* sync_inodes - writes all inodes to disk
* @wait: wait for completion
@@ -690,9 +678,6 @@ static void __sync_inodes(int wait)
spin_lock(&sb_lock);
restart:
list_for_each_entry(sb, &super_blocks, s_list) {
- if (sb->s_syncing)
- continue;
- sb->s_syncing = 1;
sb->s_count++;
spin_unlock(&sb_lock);
down_read(&sb->s_umount);
@@ -710,13 +695,10 @@ restart:
void sync_inodes(int wait)
{
- set_sb_syncing(0);
__sync_inodes(0);
- if (wait) {
- set_sb_syncing(0);
+ if (wait)
__sync_inodes(1);
- }
}
/**
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -1080,7 +1080,6 @@ struct super_block {
struct rw_semaphore s_umount;
struct mutex s_lock;
int s_count;
- int s_syncing;
int s_need_sync_fs;
atomic_t s_active;
#ifdef CONFIG_SECURITY
prev parent reply other threads:[~2009-01-23 6:31 UTC|newest]
Thread overview: 41+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20090123001330.046404396@mini.kroah.org>
2009-01-23 0:19 ` [patch 00/40] 2.6.27-stable review Greg KH
2009-01-23 6:12 ` [patch 01/40] pkt_sched: sch_htb: Fix deadlock in hrtimers triggered by HTB Greg KH
2009-01-23 6:12 ` [patch 02/40] ipv6: Fix fib6_dump_table walker leak Greg KH
2009-01-23 6:12 ` [patch 03/40] sctp: Avoid memory overflow while FWD-TSN chunk is received with bad stream ID Greg KH
2009-01-23 6:13 ` [patch 04/40] pkt_sched: cls_u32: Fix locking in u32_change() Greg KH
2009-01-23 6:13 ` [patch 05/40] r6040: fix wrong logic in mdio code Greg KH
2009-01-23 6:13 ` [patch 06/40] r6040: save and restore MIER correctly in the interrupt routine Greg KH
2009-01-23 6:13 ` [patch 07/40] r6040: bump release number to 0.19 Greg KH
2009-01-23 6:13 ` [patch 08/40] tcp: dont mask EOF and socket errors on nonblocking splice receive Greg KH
2009-01-23 6:13 ` [patch 09/40] usb-storage: add last-sector hacks Greg KH
2009-01-23 6:13 ` [patch 10/40] usb-storage: set CAPACITY_HEURISTICS flag for bad vendors Greg KH
2009-01-23 6:13 ` [patch 11/40] ALSA: hda - Add automatic model setting for Samsung Q45 Greg KH
2009-01-23 6:13 ` [patch 12/40] ALSA: hda - make laptop-eapd model back for AD1986A Greg KH
2009-01-23 6:13 ` [patch 13/40] drivers/net/irda/irda-usb.c: fix buffer overflow Greg KH
2009-01-23 6:13 ` [patch 14/40] IA64: Turn on CONFIG_HAVE_UNSTABLE_CLOCK Greg KH
2009-01-23 6:13 ` [patch 15/40] kill sig -1 must only apply to callers namespace Greg KH
2009-01-23 6:13 ` [patch 16/40] lib/idr.c: use kmem_cache_zalloc() for the idr_layer cache Greg KH
2009-01-23 6:13 ` [patch 17/40] p54usb: Add USB ID for Thomson Speedtouch 121g Greg KH
2009-01-23 6:13 ` [patch 18/40] PCI: keep ASPM link state consistent throughout PCIe hierarchy Greg KH
2009-01-23 6:14 ` [patch 19/40] rt2x00: add USB ID for the Linksys WUSB200 Greg KH
2009-01-23 6:14 ` [patch 20/40] security: introduce missing kfree Greg KH
2009-01-23 6:14 ` [patch 21/40] sgi-xp: eliminate false detection of no heartbeat Greg KH
2009-01-23 6:14 ` [patch 22/40] clocksource: introduce clocksource_forward_now() Greg KH
2009-01-23 6:14 ` [patch 23/40] hwmon-vid: Add support for AMD family 10h CPUs Greg KH
2009-01-23 6:14 ` [patch 24/40] ath9k: quiet harmless ForceXPAon messages Greg KH
2009-01-23 6:14 ` [patch 25/40] dell_rbu: use scnprintf() instead of less secure sprintf() Greg KH
2009-01-23 6:14 ` [patch 26/40] hwmon: (abituguru3) Fix CONFIG_DMI=n fallback to probe Greg KH
2009-01-23 6:14 ` [patch 27/40] powerpc: is_hugepage_only_range() must account for both 4kB and 64kB slices Greg KH
2009-01-23 6:14 ` [patch 28/40] mm: write_cache_pages cyclic fix Greg KH
2009-01-23 6:14 ` [patch 29/40] mm: write_cache_pages early loop termination Greg KH
2009-01-23 6:14 ` [patch 30/40] mm: write_cache_pages writepage error fix Greg KH
2009-01-23 6:14 ` [patch 31/40] mm: write_cache_pages integrity fix Greg KH
2009-01-23 6:14 ` [patch 32/40] mm: write_cache_pages cleanups Greg KH
2009-01-23 6:14 ` [patch 33/40] mm: write_cache_pages optimise page cleaning Greg KH
2009-01-23 6:14 ` [patch 34/40] mm: write_cache_pages terminate quickly Greg KH
2009-01-23 6:14 ` [patch 35/40] mm: write_cache_pages more " Greg KH
2009-01-23 6:14 ` [patch 36/40] mm: do_sync_mapping_range integrity fix Greg KH
2009-01-23 6:14 ` [patch 37/40] mm: direct IO starvation improvement Greg KH
2009-01-23 6:14 ` [patch 38/40] fs: remove WB_SYNC_HOLD Greg KH
2009-01-23 6:14 ` [patch 39/40] fs: sync_sb_inodes fix Greg KH
2009-01-23 6:15 ` Greg KH [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20090123061501.GN2922@kroah.com \
--to=gregkh@suse.de \
--cc=akpm@linux-foundation.org \
--cc=alan@lxorguk.ukuu.org.uk \
--cc=cavokz@gmail.com \
--cc=cebbert@redhat.com \
--cc=chuckw@quantumlinux.com \
--cc=davej@redhat.com \
--cc=eteo@redhat.com \
--cc=jake@lwn.net \
--cc=jmforbes@linuxtx.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mkrufky@linuxtv.org \
--cc=npiggin@suse.de \
--cc=rbranco@la.checkpoint.com \
--cc=rdunlap@xenotime.net \
--cc=reviews@ml.cw.f00f.org \
--cc=stable@kernel.org \
--cc=torvalds@linux-foundation.org \
--cc=tytso@mit.edu \
--cc=w@1wt.eu \
--cc=zwane@arm.linux.org.uk \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox