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

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

Pull orangefs update from Mike Marshall:

 - remove two orangefs bufmap routines that no longer have callers

* tag 'for-linus-6.15-ofs1' of git://git.kernel.org/pub/scm/linux/kernel/git/hubcap/linux:
  orangefs: Bufmap deadcoding
parents c148bc75 121a83ce

fs/orangefs/orangefs-bufmap.c

+0 −25
Original line number Diff line number Diff line
@@ -197,18 +197,6 @@ int orangefs_bufmap_size_query(void) 
	return size;

}



int orangefs_bufmap_shift_query(void)

{

	struct orangefs_bufmap *bufmap;

	int shift = 0;

	spin_lock(&orangefs_bufmap_lock);

	bufmap = __orangefs_bufmap;

	if (bufmap)

		shift = bufmap->desc_shift;

	spin_unlock(&orangefs_bufmap_lock);

	return shift;

}



static DECLARE_WAIT_QUEUE_HEAD(bufmap_waitq);

static DECLARE_WAIT_QUEUE_HEAD(readdir_waitq);
@@ -532,16 +520,3 @@ int orangefs_bufmap_copy_to_iovec(struct iov_iter *iter, 
	}

	return 0;

}
 


void orangefs_bufmap_page_fill(void *page_to,

				int buffer_index,

				int slot_index)

{

	struct orangefs_bufmap_desc *from;

	void *page_from;



	from = &__orangefs_bufmap->desc_array[buffer_index];

	page_from = kmap_atomic(from->page_array[slot_index]);

	memcpy(page_to, page_from, PAGE_SIZE);

	kunmap_atomic(page_from);

}

fs/orangefs/orangefs-bufmap.h

+0 −3
Original line number Diff line number Diff line
@@ -10,8 +10,6 @@ 


int orangefs_bufmap_size_query(void);



int orangefs_bufmap_shift_query(void);



int orangefs_bufmap_initialize(struct ORANGEFS_dev_map_desc *user_desc);



void orangefs_bufmap_finalize(void);
@@ -34,6 +32,5 @@ int orangefs_bufmap_copy_to_iovec(struct iov_iter *iter, 
			      int buffer_index,

			      size_t size);



void orangefs_bufmap_page_fill(void *kaddr, int buffer_index, int slot_index);



#endif /* __ORANGEFS_BUFMAP_H */