diff options
| author | H. Peter Anvin <hpa@zytor.com> | 2009-08-27 02:17:51 +0200 |
|---|---|---|
| committer | H. Peter Anvin <hpa@zytor.com> | 2009-08-27 02:24:28 +0200 |
| commit | b855192c08fcb14adbc5d3a7cab182022d433cca (patch) | |
| tree | 3a10cafbfbf98cafacf667eb218c71300b351bfa /fs/fat/file.c | |
| parent | x86, pat: Sanity check remap_pfn_range for RAM region (diff) | |
| parent | x86: Fix an incorrect argument of reserve_bootmem() (diff) | |
| download | linux-b855192c08fcb14adbc5d3a7cab182022d433cca.tar.xz linux-b855192c08fcb14adbc5d3a7cab182022d433cca.zip | |
Merge branch 'x86/urgent' into x86/pat
Reason: Change to is_new_memtype_allowed() in x86/urgent
Resolved semantic conflicts in:
arch/x86/mm/pat.c
arch/x86/mm/ioremap.c
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Diffstat (limited to 'fs/fat/file.c')
| -rw-r--r-- | fs/fat/file.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/fat/file.c b/fs/fat/file.c index b28ea646ff60..f042b965c95c 100644 --- a/fs/fat/file.c +++ b/fs/fat/file.c @@ -134,7 +134,7 @@ static int fat_file_release(struct inode *inode, struct file *filp) if ((filp->f_mode & FMODE_WRITE) && MSDOS_SB(inode->i_sb)->options.flush) { fat_flush_inodes(inode->i_sb, inode, NULL); - congestion_wait(WRITE, HZ/10); + congestion_wait(BLK_RW_ASYNC, HZ/10); } return 0; } |