diff options
| author | David S. Miller <davem@davemloft.net> | 2008-10-31 03:17:34 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-10-31 03:17:34 -0400 |
| commit | a1744d3bee19d3b9cbfb825ab316a101b9c9f109 (patch) | |
| tree | c0e2324c09beca0eb5782eb5abf241ea2b7a4a11 /fs/fat/inode.c | |
| parent | 275f165fa970174f8a98205529750e8abb6c0a33 (diff) | |
| parent | a432226614c5616e3cfd211e0acffa0acfb4770c (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/wireless/p54/p54common.c
Diffstat (limited to 'fs/fat/inode.c')
| -rw-r--r-- | fs/fat/inode.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/fat/inode.c b/fs/fat/inode.c index 19eafbe3c379..2b2eec1283bf 100644 --- a/fs/fat/inode.c +++ b/fs/fat/inode.c | |||
| @@ -175,7 +175,7 @@ static ssize_t fat_direct_IO(int rw, struct kiocb *iocb, | |||
| 175 | 175 | ||
| 176 | if (rw == WRITE) { | 176 | if (rw == WRITE) { |
| 177 | /* | 177 | /* |
| 178 | * FIXME: blockdev_direct_IO() doesn't use ->prepare_write(), | 178 | * FIXME: blockdev_direct_IO() doesn't use ->write_begin(), |
| 179 | * so we need to update the ->mmu_private to block boundary. | 179 | * so we need to update the ->mmu_private to block boundary. |
| 180 | * | 180 | * |
| 181 | * But we must fill the remaining area or hole by nul for | 181 | * But we must fill the remaining area or hole by nul for |