diff options
Diffstat (limited to 'fs/ntfs/compress.c')
| -rw-r--r-- | fs/ntfs/compress.c | 7 | 
1 files changed, 3 insertions, 4 deletions
diff --git a/fs/ntfs/compress.c b/fs/ntfs/compress.c index 6551c7cbad9..f82498c35e7 100644 --- a/fs/ntfs/compress.c +++ b/fs/ntfs/compress.c @@ -58,7 +58,7 @@ typedef enum {  /**   * ntfs_compression_buffer - one buffer for the decompression engine   */ -static u8 *ntfs_compression_buffer = NULL; +static u8 *ntfs_compression_buffer;  /**   * ntfs_cb_lock - spinlock which protects ntfs_compression_buffer @@ -501,7 +501,7 @@ int ntfs_read_compressed_block(struct page *page)  	VCN start_vcn = (((s64)index << PAGE_CACHE_SHIFT) & ~cb_size_mask) >>  			vol->cluster_size_bits;  	/* -	 * The first vcn after the last wanted vcn (minumum alignment is again +	 * The first vcn after the last wanted vcn (minimum alignment is again  	 * PAGE_CACHE_SIZE.  	 */  	VCN end_vcn = ((((s64)(index + 1UL) << PAGE_CACHE_SHIFT) + cb_size - 1) @@ -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;  | 
