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/xfs_log_priv.h | |
| 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/xfs_log_priv.h')
| -rw-r--r-- | fs/xfs/xfs_log_priv.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/xfs/xfs_log_priv.h b/fs/xfs/xfs_log_priv.h index 15dbf1f9c2b..ffae692c983 100644 --- a/fs/xfs/xfs_log_priv.h +++ b/fs/xfs/xfs_log_priv.h | |||
| @@ -570,7 +570,7 @@ int xlog_write(struct log *log, struct xfs_log_vec *log_vector, | |||
| 570 | * When we crack an atomic LSN, we sample it first so that the value will not | 570 | * When we crack an atomic LSN, we sample it first so that the value will not |
| 571 | * change while we are cracking it into the component values. This means we | 571 | * change while we are cracking it into the component values. This means we |
| 572 | * will always get consistent component values to work from. This should always | 572 | * will always get consistent component values to work from. This should always |
| 573 | * be used to smaple and crack LSNs taht are stored and updated in atomic | 573 | * be used to sample and crack LSNs that are stored and updated in atomic |
| 574 | * variables. | 574 | * variables. |
| 575 | */ | 575 | */ |
| 576 | static inline void | 576 | static inline void |