Commit aaa2faab authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'for-linus-5.8-ofs1' of git://git.kernel.org/pub/scm/linux/kernel/git/hubcap/linux 

Pull orangefs updates from Mike Marshall:

 - John Hubbard's conversion from get_user_pages() to pin_user_pages()

 - Colin Ian King's removal of an unneeded variable initialization

* tag 'for-linus-5.8-ofs1' of git://git.kernel.org/pub/scm/linux/kernel/git/hubcap/linux:
  orangefs: convert get_user_pages() --> pin_user_pages()
  orangefs: remove redundant assignment to variable ret
parents e3cea0ca 0df55645

fs/orangefs/orangefs-bufmap.c

+3 −6
Original line number Original line Diff line number Diff line
@@ -168,10 +168,7 @@ static DEFINE_SPINLOCK(orangefs_bufmap_lock); 
static void

static void

orangefs_bufmap_unmap(struct orangefs_bufmap *bufmap)

orangefs_bufmap_unmap(struct orangefs_bufmap *bufmap)

{

{

	int i;

	unpin_user_pages(bufmap->page_array, bufmap->page_count);



	for (i = 0; i < bufmap->page_count; i++)

		put_page(bufmap->page_array[i]);

}

}





static void

static void
@@ -268,7 +265,7 @@ orangefs_bufmap_map(struct orangefs_bufmap *bufmap, 
	int offset = 0, ret, i;

	int offset = 0, ret, i;





	/* map the pages */

	/* map the pages */

	ret = get_user_pages_fast((unsigned long)user_desc->ptr,

	ret = pin_user_pages_fast((unsigned long)user_desc->ptr,

			     bufmap->page_count, FOLL_WRITE, bufmap->page_array);

			     bufmap->page_count, FOLL_WRITE, bufmap->page_array);





	if (ret < 0)

	if (ret < 0)
@@ -280,7 +277,7 @@ orangefs_bufmap_map(struct orangefs_bufmap *bufmap, 




		for (i = 0; i < ret; i++) {

		for (i = 0; i < ret; i++) {

			SetPageError(bufmap->page_array[i]);

			SetPageError(bufmap->page_array[i]);

			put_page(bufmap->page_array[i]);

			unpin_user_page(bufmap->page_array[i]);

		}

		}

		return -ENOMEM;

		return -ENOMEM;

	}

	}

fs/orangefs/orangefs-mod.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -79,7 +79,7 @@ DECLARE_WAIT_QUEUE_HEAD(orangefs_request_list_waitq); 




static int __init orangefs_init(void)

static int __init orangefs_init(void)

{

{

	int ret = -1;

	int ret;

	__u32 i = 0;

	__u32 i = 0;





	if (op_timeout_secs < 0)

	if (op_timeout_secs < 0)