diff options
| author | Jens Axboe <axboe@kernel.dk> | 2017-09-27 05:40:16 -0600 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2017-10-03 08:38:17 -0600 |
| commit | 640ab98fb3629c0f8417b9b2532eca596495f3bb (patch) | |
| tree | 59f6d84e07327e6b94473bcd66e7366582b7f85b /fs/ntfs | |
| parent | 7beb2f845b715cb98584cf630e9a9d5b05501166 (diff) | |
| download | linux-640ab98fb3629c0f8417b9b2532eca596495f3bb.tar.gz linux-640ab98fb3629c0f8417b9b2532eca596495f3bb.tar.bz2 linux-640ab98fb3629c0f8417b9b2532eca596495f3bb.zip | |
buffer: have alloc_page_buffers() use __GFP_NOFAIL
Instead of adding weird retry logic in that function, utilize
__GFP_NOFAIL to ensure that the vm takes care of handling any
potential retries appropriately. This means we don't have to
call free_more_memory() from here.
Reviewed-by: Nikolay Borisov <nborisov@suse.com>
Reviewed-by: Jan Kara <jack@suse.cz>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'fs/ntfs')
| -rw-r--r-- | fs/ntfs/aops.c | 2 | ||||
| -rw-r--r-- | fs/ntfs/mft.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/fs/ntfs/aops.c b/fs/ntfs/aops.c index cc91856b5e2d..3a2e509c77c5 100644 --- a/fs/ntfs/aops.c +++ b/fs/ntfs/aops.c @@ -1739,7 +1739,7 @@ void mark_ntfs_record_dirty(struct page *page, const unsigned int ofs) { spin_lock(&mapping->private_lock); if (unlikely(!page_has_buffers(page))) { spin_unlock(&mapping->private_lock); - bh = head = alloc_page_buffers(page, bh_size, 1); + bh = head = alloc_page_buffers(page, bh_size, true); spin_lock(&mapping->private_lock); if (likely(!page_has_buffers(page))) { struct buffer_head *tail; diff --git a/fs/ntfs/mft.c b/fs/ntfs/mft.c index b6f402194f02..ee8392aee9f6 100644 --- a/fs/ntfs/mft.c +++ b/fs/ntfs/mft.c @@ -507,7 +507,7 @@ int ntfs_sync_mft_mirror(ntfs_volume *vol, const unsigned long mft_no, if (unlikely(!page_has_buffers(page))) { struct buffer_head *tail; - bh = head = alloc_page_buffers(page, blocksize, 1); + bh = head = alloc_page_buffers(page, blocksize, true); do { set_buffer_uptodate(bh); tail = bh; |