diff options
| -rw-r--r-- | kernel/watch_queue.c | 7 | 
1 files changed, 2 insertions, 5 deletions
| diff --git a/kernel/watch_queue.c b/kernel/watch_queue.c index 4bcd400984a7..5b516eb2c7cc 100644 --- a/kernel/watch_queue.c +++ b/kernel/watch_queue.c @@ -220,7 +220,6 @@ long watch_queue_set_size(struct pipe_inode_info *pipe, unsigned int nr_notes)  	struct page **pages;  	unsigned long *bitmap;  	unsigned long user_bufs; -	unsigned int bmsize;  	int ret, i, nr_pages;  	if (!wqueue) @@ -259,13 +258,11 @@ long watch_queue_set_size(struct pipe_inode_info *pipe, unsigned int nr_notes)  		pages[i]->index = i * WATCH_QUEUE_NOTES_PER_PAGE;  	} -	bmsize = (nr_notes + BITS_PER_LONG - 1) / BITS_PER_LONG; -	bmsize *= sizeof(unsigned long); -	bitmap = kmalloc(bmsize, GFP_KERNEL); +	bitmap = bitmap_alloc(nr_notes, GFP_KERNEL);  	if (!bitmap)  		goto error_p; -	memset(bitmap, 0xff, bmsize); +	bitmap_fill(bitmap, nr_notes);  	wqueue->notes = pages;  	wqueue->notes_bitmap = bitmap;  	wqueue->nr_pages = nr_pages; | 
