dummy/linux-stable-mirror
1
0
Fork 1
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ synced 2025-04-19 20:58:31 +09:00
Code Issues Packages Projects Releases Wiki Activity

orangefs: one fixup

Browse Source 
From "Dr. David Alan Gilbert" <linux@treblig.org>
 remove two orangefs bufmap routines that no longer have callers.
 -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCAAdFiEEWLOQAZkv9m2xtUCf/Vh1C1u0YnAFAmfi9WEACgkQ/Vh1C1u0
 YnAQ+w//UJMBZHjvnrrDYL/RJdohXVB3/ct9KmI/FrhMAmxUtFMQX5sBwPZOg3LF
 r4m1y4GbM+/5mjYEnRePGiknjJ4TTjf1mRCDZoYPrlWAtirTsWQefTPC6uNfq39B
 1vrqHl+dWaxPz5L3xTJJx3G+apmxpq+KR/JYpxI4GsJqEQ6Sf/p5DWPDRiEteWXw
 mR18hsIEIhPEAfGovInEG6hT81jIHWcNIKA3oJhWe+B0cZaspYZRgvTWN+jvPoxB
 fbUkLxAc0oHQ4+PvIOMmQk4mp7zZvCrhY2bzShwS6cA35qmOb6WFbJxEvbe//ZDR
 NQBAqeXcDWrHpt5unDtjJrCOeOolq39MEdPXl9GjplZ7Dl5SPBy9XqnSIdUrQkPc
 hAMXF43M80j8I9OAVO7nXouhAI1YV1aQRZJQyc2zMpdTOZ/BRHEwiMyoHUCJIEHE
 Yuo5fH7e8B8hyfsaMNBgMBhwtKSGmz5uZMcc+XJ+2BXCE4l8MKXhmNK0Qlcjo/pe
 /QPu5+XVJcom+1KbIOsKUMYwp2iCopKrs02mLjEXM4Y80y6tTrA9hAby2tr3gjwW
 K982GTkhY/n4gWaZS4xjoVyTjmdk4+uKPMQFuUddxwVAdFCDkxS59olJEGqKGwfM
 lN6z1UaOh1q6LNN/5SDQVBNn7TBGRMYyTYWTL1Kdg3Ul0MMx9vY=
 =mSww
 -----END PGP SIGNATURE-----

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
This commit is contained in:
Linus Torvalds 2025-03-27 13:14:39 -07:00
commit fde05627a2
2 changed files with 0 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
fs/orangefs/orangefs-bufmap.c
View File

@ -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);
}

3
fs/orangefs/orangefs-bufmap.h
View File

@ -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 */