diff options
author | David S. Miller <davem@davemloft.net> | 2012-08-22 23:21:38 +0200 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2012-08-22 23:21:38 +0200 |
commit | 1304a7343b30fc4f16045412efdbb4179a3d9255 (patch) | |
tree | 83d667ac4f62e30f70305ce4cc7e030e3465f92e /fs/gfs2/meta_io.c | |
parent | team: add support for non-ethernet devices (diff) | |
parent | Merge branch 'akpm' (Andrew's patch-bomb) (diff) | |
download | linux-1304a7343b30fc4f16045412efdbb4179a3d9255.tar.xz linux-1304a7343b30fc4f16045412efdbb4179a3d9255.zip |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Diffstat (limited to 'fs/gfs2/meta_io.c')
-rw-r--r-- | fs/gfs2/meta_io.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/gfs2/meta_io.c b/fs/gfs2/meta_io.c index 3a56c8d94de0..22255d96b27e 100644 --- a/fs/gfs2/meta_io.c +++ b/fs/gfs2/meta_io.c @@ -52,7 +52,7 @@ static int gfs2_aspace_writepage(struct page *page, struct writeback_control *wb /* * If it's a fully non-blocking write attempt and we cannot * lock the buffer then redirty the page. Note that this can - * potentially cause a busy-wait loop from pdflush and kswapd + * potentially cause a busy-wait loop from flusher thread and kswapd * activity, but those code paths have their own higher-level * throttling. */ |