diff options
author | 2011-04-13 13:32:28 +0200 | |
---|---|---|
committer | 2011-04-13 13:32:28 +0200 | |
commit | b32e3dc7860d00124fa432dba09667e647cb9bcc (patch) | |
tree | 2fa6e56f389431dfb84609d3d7572cad76e88e71 /fs/ntfs/compress.c | |
parent | netfilter: ipset: References are protected by rwlock instead of mutex (diff) | |
parent | netfilter: xt_conntrack: fix inverted conntrack direction test (diff) | |
download | wireguard-linux-b32e3dc7860d00124fa432dba09667e647cb9bcc.tar.xz wireguard-linux-b32e3dc7860d00124fa432dba09667e647cb9bcc.zip |
Merge branch 'master' of ssh://master.kernel.org/pub/scm/linux/kernel/git/kaber/nf-2.6
Diffstat (limited to 'fs/ntfs/compress.c')
-rw-r--r-- | fs/ntfs/compress.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/fs/ntfs/compress.c b/fs/ntfs/compress.c index 6551c7cbad92..ef9ed854255c 100644 --- a/fs/ntfs/compress.c +++ b/fs/ntfs/compress.c @@ -698,8 +698,7 @@ lock_retry_remap: "uptodate! Unplugging the disk queue " "and rescheduling."); get_bh(tbh); - blk_run_address_space(mapping); - schedule(); + io_schedule(); put_bh(tbh); if (unlikely(!buffer_uptodate(tbh))) goto read_err; |