diff options
| author | David S. Miller <davem@davemloft.net> | 2011-04-11 16:44:25 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-04-11 16:44:25 -0400 |
| commit | 1c01a80cfec6f806246f31ff2680cd3639b30e67 (patch) | |
| tree | 0b554aad2ec1da71ecf6339d4ba51617bfe1dc3c /fs/xfs/linux-2.6/xfs_sync.c | |
| parent | c44d79950b2daa1025e62eede73e4e4a274d1ef3 (diff) | |
| parent | 4a9f65f6304a00f6473e83b19c1e83caa1e42530 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/smsc911x.c
Diffstat (limited to 'fs/xfs/linux-2.6/xfs_sync.c')
| -rw-r--r-- | fs/xfs/linux-2.6/xfs_sync.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/xfs/linux-2.6/xfs_sync.c b/fs/xfs/linux-2.6/xfs_sync.c index 594cd822d84..9cf35a688f5 100644 --- a/fs/xfs/linux-2.6/xfs_sync.c +++ b/fs/xfs/linux-2.6/xfs_sync.c | |||
| @@ -401,7 +401,7 @@ xfs_quiesce_fs( | |||
| 401 | /* | 401 | /* |
| 402 | * Second stage of a quiesce. The data is already synced, now we have to take | 402 | * Second stage of a quiesce. The data is already synced, now we have to take |
| 403 | * care of the metadata. New transactions are already blocked, so we need to | 403 | * care of the metadata. New transactions are already blocked, so we need to |
| 404 | * wait for any remaining transactions to drain out before proceding. | 404 | * wait for any remaining transactions to drain out before proceeding. |
| 405 | */ | 405 | */ |
| 406 | void | 406 | void |
| 407 | xfs_quiesce_attr( | 407 | xfs_quiesce_attr( |