diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-07-30 22:14:04 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-07-30 22:14:04 -0700 |
| commit | 2e3ee613480563a6d5c01b57d342e65cc58c06df (patch) | |
| tree | b6b82d1ade41f137bdb9a5a18d8aa446e149c8b2 /fs/super.c | |
| parent | 1fad1e9a747687a7399bf58e87974f9b1bbcae06 (diff) | |
| parent | 331cbdeedeb2f4ef01ccb761513708af0fe77098 (diff) | |
| download | linux-2e3ee613480563a6d5c01b57d342e65cc58c06df.tar.bz2 | |
Merge tag 'writeback-proportions' of git://git.kernel.org/pub/scm/linux/kernel/git/wfg/linux
Pull writeback updates from Wu Fengguang:
"Use time based periods to age the writeback proportions, which can
adapt equally well to fast/slow devices."
Fix up trivial conflict in comment in fs/sync.c
* tag 'writeback-proportions' of git://git.kernel.org/pub/scm/linux/kernel/git/wfg/linux:
writeback: Fix some comment errors
block: Convert BDI proportion calculations to flexible proportions
lib: Fix possible deadlock in flexible proportion code
lib: Proportions with flexible period
Diffstat (limited to 'fs/super.c')
| -rw-r--r-- | fs/super.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/super.c b/fs/super.c index c743fb3be4b8..4c5d82f56ec4 100644 --- a/fs/super.c +++ b/fs/super.c @@ -320,7 +320,7 @@ static int grab_super(struct super_block *s) __releases(sb_lock) /* * grab_super_passive - acquire a passive reference - * @s: reference we are trying to grab + * @sb: reference we are trying to grab * * Tries to acquire a passive reference. This is used in places where we * cannot take an active reference but we need to ensure that the |