Skip to content

Commit fde0562

Browse files
committed
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
2 parents c148bc7 + 121a83c commit fde0562

File tree

2 files changed

+0
-28
lines changed

2 files changed

+0
-28
lines changed

fs/orangefs/orangefs-bufmap.c

Lines changed: 0 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -197,18 +197,6 @@ int orangefs_bufmap_size_query(void)
197197
return size;
198198
}
199199

200-
int orangefs_bufmap_shift_query(void)
201-
{
202-
struct orangefs_bufmap *bufmap;
203-
int shift = 0;
204-
spin_lock(&orangefs_bufmap_lock);
205-
bufmap = __orangefs_bufmap;
206-
if (bufmap)
207-
shift = bufmap->desc_shift;
208-
spin_unlock(&orangefs_bufmap_lock);
209-
return shift;
210-
}
211-
212200
static DECLARE_WAIT_QUEUE_HEAD(bufmap_waitq);
213201
static DECLARE_WAIT_QUEUE_HEAD(readdir_waitq);
214202

@@ -532,16 +520,3 @@ int orangefs_bufmap_copy_to_iovec(struct iov_iter *iter,
532520
}
533521
return 0;
534522
}
535-
536-
void orangefs_bufmap_page_fill(void *page_to,
537-
int buffer_index,
538-
int slot_index)
539-
{
540-
struct orangefs_bufmap_desc *from;
541-
void *page_from;
542-
543-
from = &__orangefs_bufmap->desc_array[buffer_index];
544-
page_from = kmap_atomic(from->page_array[slot_index]);
545-
memcpy(page_to, page_from, PAGE_SIZE);
546-
kunmap_atomic(page_from);
547-
}

fs/orangefs/orangefs-bufmap.h

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,6 @@
1010

1111
int orangefs_bufmap_size_query(void);
1212

13-
int orangefs_bufmap_shift_query(void);
14-
1513
int orangefs_bufmap_initialize(struct ORANGEFS_dev_map_desc *user_desc);
1614

1715
void orangefs_bufmap_finalize(void);
@@ -34,6 +32,5 @@ int orangefs_bufmap_copy_to_iovec(struct iov_iter *iter,
3432
int buffer_index,
3533
size_t size);
3634

37-
void orangefs_bufmap_page_fill(void *kaddr, int buffer_index, int slot_index);
3835

3936
#endif /* __ORANGEFS_BUFMAP_H */

0 commit comments

Comments
 (0)