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/ext4/fsync.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/ext4/fsync.c')
| -rw-r--r-- | fs/ext4/fsync.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/ext4/fsync.c b/fs/ext4/fsync.c index 7f74019d6d7..4673bc05274 100644 --- a/fs/ext4/fsync.c +++ b/fs/ext4/fsync.c | |||
| @@ -101,7 +101,7 @@ extern int ext4_flush_completed_IO(struct inode *inode) | |||
| 101 | * to the work-to-be schedule is freed. | 101 | * to the work-to-be schedule is freed. |
| 102 | * | 102 | * |
| 103 | * Thus we need to keep the io structure still valid here after | 103 | * Thus we need to keep the io structure still valid here after |
| 104 | * convertion finished. The io structure has a flag to | 104 | * conversion finished. The io structure has a flag to |
| 105 | * avoid double converting from both fsync and background work | 105 | * avoid double converting from both fsync and background work |
| 106 | * queue work. | 106 | * queue work. |
| 107 | */ | 107 | */ |