* [PATCH 1/5] libceph: Remove unused ceph_pagelist functions
2024-10-06 1:19 [PATCH 0/5] Ceph deadcoding linux
@ 2024-10-06 1:19 ` linux
2024-10-06 1:19 ` [PATCH 2/5] libceph: Remove unused pagevec functions linux
` (5 subsequent siblings)
6 siblings, 0 replies; 9+ messages in thread
From: linux @ 2024-10-06 1:19 UTC (permalink / raw)
To: xiubli, idryomov, ceph-devel; +Cc: linux-kernel, Dr. David Alan Gilbert
From: "Dr. David Alan Gilbert" <linux@treblig.org>
ceph_pagelist_truncate() and ceph_pagelist_set_cursor() have been unused
since commit
39be95e9c8c0 ("ceph: ceph_pagelist_append might sleep while atomic")
Remove them.
Signed-off-by: Dr. David Alan Gilbert <linux@treblig.org>
---
include/linux/ceph/pagelist.h | 12 -----------
net/ceph/pagelist.c | 38 -----------------------------------
2 files changed, 50 deletions(-)
diff --git a/include/linux/ceph/pagelist.h b/include/linux/ceph/pagelist.h
index 5dead8486fd8..879bec0863aa 100644
--- a/include/linux/ceph/pagelist.h
+++ b/include/linux/ceph/pagelist.h
@@ -17,12 +17,6 @@ struct ceph_pagelist {
refcount_t refcnt;
};
-struct ceph_pagelist_cursor {
- struct ceph_pagelist *pl; /* pagelist, for error checking */
- struct list_head *page_lru; /* page in list */
- size_t room; /* room remaining to reset to */
-};
-
struct ceph_pagelist *ceph_pagelist_alloc(gfp_t gfp_flags);
extern void ceph_pagelist_release(struct ceph_pagelist *pl);
@@ -33,12 +27,6 @@ extern int ceph_pagelist_reserve(struct ceph_pagelist *pl, size_t space);
extern int ceph_pagelist_free_reserve(struct ceph_pagelist *pl);
-extern void ceph_pagelist_set_cursor(struct ceph_pagelist *pl,
- struct ceph_pagelist_cursor *c);
-
-extern int ceph_pagelist_truncate(struct ceph_pagelist *pl,
- struct ceph_pagelist_cursor *c);
-
static inline int ceph_pagelist_encode_64(struct ceph_pagelist *pl, u64 v)
{
__le64 ev = cpu_to_le64(v);
diff --git a/net/ceph/pagelist.c b/net/ceph/pagelist.c
index 74622b278d57..5a9c4be5f222 100644
--- a/net/ceph/pagelist.c
+++ b/net/ceph/pagelist.c
@@ -131,41 +131,3 @@ int ceph_pagelist_free_reserve(struct ceph_pagelist *pl)
return 0;
}
EXPORT_SYMBOL(ceph_pagelist_free_reserve);
-
-/* Create a truncation point. */
-void ceph_pagelist_set_cursor(struct ceph_pagelist *pl,
- struct ceph_pagelist_cursor *c)
-{
- c->pl = pl;
- c->page_lru = pl->head.prev;
- c->room = pl->room;
-}
-EXPORT_SYMBOL(ceph_pagelist_set_cursor);
-
-/* Truncate a pagelist to the given point. Move extra pages to reserve.
- * This won't sleep.
- * Returns: 0 on success,
- * -EINVAL if the pagelist doesn't match the trunc point pagelist
- */
-int ceph_pagelist_truncate(struct ceph_pagelist *pl,
- struct ceph_pagelist_cursor *c)
-{
- struct page *page;
-
- if (pl != c->pl)
- return -EINVAL;
- ceph_pagelist_unmap_tail(pl);
- while (pl->head.prev != c->page_lru) {
- page = list_entry(pl->head.prev, struct page, lru);
- /* move from pagelist to reserve */
- list_move_tail(&page->lru, &pl->free_list);
- ++pl->num_pages_free;
- }
- pl->room = c->room;
- if (!list_empty(&pl->head)) {
- page = list_entry(pl->head.prev, struct page, lru);
- pl->mapped_tail = kmap(page);
- }
- return 0;
-}
-EXPORT_SYMBOL(ceph_pagelist_truncate);
--
2.46.2
^ permalink raw reply [flat|nested] 9+ messages in thread* [PATCH 2/5] libceph: Remove unused pagevec functions
2024-10-06 1:19 [PATCH 0/5] Ceph deadcoding linux
2024-10-06 1:19 ` [PATCH 1/5] libceph: Remove unused ceph_pagelist functions linux
@ 2024-10-06 1:19 ` linux
2024-10-06 1:19 ` [PATCH 3/5] libceph: Remove unused ceph_osdc_watch_check linux
` (4 subsequent siblings)
6 siblings, 0 replies; 9+ messages in thread
From: linux @ 2024-10-06 1:19 UTC (permalink / raw)
To: xiubli, idryomov, ceph-devel; +Cc: linux-kernel, Dr. David Alan Gilbert
From: "Dr. David Alan Gilbert" <linux@treblig.org>
ceph_copy_user_to_page_vector() has been unused since 2013's commit
e8344e668915 ("ceph: Implement writev/pwritev for sync operation.")
ceph_copy_to_page_vector() has been unused since 2012's commit
913d2fdcf605 ("rbd: always pass ops array to rbd_req_sync_op()")
Remove them.
Signed-off-by: Dr. David Alan Gilbert <linux@treblig.org>
---
include/linux/ceph/libceph.h | 6 -----
net/ceph/pagevec.c | 52 ------------------------------------
2 files changed, 58 deletions(-)
diff --git a/include/linux/ceph/libceph.h b/include/linux/ceph/libceph.h
index 15fb566d3f46..733e7f93db66 100644
--- a/include/linux/ceph/libceph.h
+++ b/include/linux/ceph/libceph.h
@@ -317,12 +317,6 @@ extern void ceph_release_page_vector(struct page **pages, int num_pages);
extern void ceph_put_page_vector(struct page **pages, int num_pages,
bool dirty);
extern struct page **ceph_alloc_page_vector(int num_pages, gfp_t flags);
-extern int ceph_copy_user_to_page_vector(struct page **pages,
- const void __user *data,
- loff_t off, size_t len);
-extern void ceph_copy_to_page_vector(struct page **pages,
- const void *data,
- loff_t off, size_t len);
extern void ceph_copy_from_page_vector(struct page **pages,
void *data,
loff_t off, size_t len);
diff --git a/net/ceph/pagevec.c b/net/ceph/pagevec.c
index 64305e7056a1..4509757d8b3b 100644
--- a/net/ceph/pagevec.c
+++ b/net/ceph/pagevec.c
@@ -55,58 +55,6 @@ struct page **ceph_alloc_page_vector(int num_pages, gfp_t flags)
}
EXPORT_SYMBOL(ceph_alloc_page_vector);
-/*
- * copy user data into a page vector
- */
-int ceph_copy_user_to_page_vector(struct page **pages,
- const void __user *data,
- loff_t off, size_t len)
-{
- int i = 0;
- int po = off & ~PAGE_MASK;
- int left = len;
- int l, bad;
-
- while (left > 0) {
- l = min_t(int, PAGE_SIZE-po, left);
- bad = copy_from_user(page_address(pages[i]) + po, data, l);
- if (bad == l)
- return -EFAULT;
- data += l - bad;
- left -= l - bad;
- po += l - bad;
- if (po == PAGE_SIZE) {
- po = 0;
- i++;
- }
- }
- return len;
-}
-EXPORT_SYMBOL(ceph_copy_user_to_page_vector);
-
-void ceph_copy_to_page_vector(struct page **pages,
- const void *data,
- loff_t off, size_t len)
-{
- int i = 0;
- size_t po = off & ~PAGE_MASK;
- size_t left = len;
-
- while (left > 0) {
- size_t l = min_t(size_t, PAGE_SIZE-po, left);
-
- memcpy(page_address(pages[i]) + po, data, l);
- data += l;
- left -= l;
- po += l;
- if (po == PAGE_SIZE) {
- po = 0;
- i++;
- }
- }
-}
-EXPORT_SYMBOL(ceph_copy_to_page_vector);
-
void ceph_copy_from_page_vector(struct page **pages,
void *data,
loff_t off, size_t len)
--
2.46.2
^ permalink raw reply [flat|nested] 9+ messages in thread* [PATCH 3/5] libceph: Remove unused ceph_osdc_watch_check
2024-10-06 1:19 [PATCH 0/5] Ceph deadcoding linux
2024-10-06 1:19 ` [PATCH 1/5] libceph: Remove unused ceph_pagelist functions linux
2024-10-06 1:19 ` [PATCH 2/5] libceph: Remove unused pagevec functions linux
@ 2024-10-06 1:19 ` linux
2024-10-06 1:19 ` [PATCH 4/5] libceph: Remove unused ceph_crypto_key_encode linux
` (3 subsequent siblings)
6 siblings, 0 replies; 9+ messages in thread
From: linux @ 2024-10-06 1:19 UTC (permalink / raw)
To: xiubli, idryomov, ceph-devel; +Cc: linux-kernel, Dr. David Alan Gilbert
From: "Dr. David Alan Gilbert" <linux@treblig.org>
ceph_osdc_watch_check() has been unused since it was added in commit
b07d3c4bd727 ("libceph: support for checking on status of watch")
Remove it.
Signed-off-by: Dr. David Alan Gilbert <linux@treblig.org>
---
include/linux/ceph/osd_client.h | 2 --
net/ceph/osd_client.c | 34 ---------------------------------
2 files changed, 36 deletions(-)
diff --git a/include/linux/ceph/osd_client.h b/include/linux/ceph/osd_client.h
index d7941478158c..d55b30057a45 100644
--- a/include/linux/ceph/osd_client.h
+++ b/include/linux/ceph/osd_client.h
@@ -626,8 +626,6 @@ int ceph_osdc_notify(struct ceph_osd_client *osdc,
u32 timeout,
struct page ***preply_pages,
size_t *preply_len);
-int ceph_osdc_watch_check(struct ceph_osd_client *osdc,
- struct ceph_osd_linger_request *lreq);
int ceph_osdc_list_watchers(struct ceph_osd_client *osdc,
struct ceph_object_id *oid,
struct ceph_object_locator *oloc,
diff --git a/net/ceph/osd_client.c b/net/ceph/osd_client.c
index 9d078b37fe0b..9b1168eb77ab 100644
--- a/net/ceph/osd_client.c
+++ b/net/ceph/osd_client.c
@@ -4999,40 +4999,6 @@ int ceph_osdc_notify(struct ceph_osd_client *osdc,
}
EXPORT_SYMBOL(ceph_osdc_notify);
-/*
- * Return the number of milliseconds since the watch was last
- * confirmed, or an error. If there is an error, the watch is no
- * longer valid, and should be destroyed with ceph_osdc_unwatch().
- */
-int ceph_osdc_watch_check(struct ceph_osd_client *osdc,
- struct ceph_osd_linger_request *lreq)
-{
- unsigned long stamp, age;
- int ret;
-
- down_read(&osdc->lock);
- mutex_lock(&lreq->lock);
- stamp = lreq->watch_valid_thru;
- if (!list_empty(&lreq->pending_lworks)) {
- struct linger_work *lwork =
- list_first_entry(&lreq->pending_lworks,
- struct linger_work,
- pending_item);
-
- if (time_before(lwork->queued_stamp, stamp))
- stamp = lwork->queued_stamp;
- }
- age = jiffies - stamp;
- dout("%s lreq %p linger_id %llu age %lu last_error %d\n", __func__,
- lreq, lreq->linger_id, age, lreq->last_error);
- /* we are truncating to msecs, so return a safe upper bound */
- ret = lreq->last_error ?: 1 + jiffies_to_msecs(age);
-
- mutex_unlock(&lreq->lock);
- up_read(&osdc->lock);
- return ret;
-}
-
static int decode_watcher(void **p, void *end, struct ceph_watch_item *item)
{
u8 struct_v;
--
2.46.2
^ permalink raw reply [flat|nested] 9+ messages in thread* [PATCH 4/5] libceph: Remove unused ceph_crypto_key_encode
2024-10-06 1:19 [PATCH 0/5] Ceph deadcoding linux
` (2 preceding siblings ...)
2024-10-06 1:19 ` [PATCH 3/5] libceph: Remove unused ceph_osdc_watch_check linux
@ 2024-10-06 1:19 ` linux
2024-10-06 1:19 ` [PATCH 5/5] ceph: Remove fs/ceph deadcode linux
` (2 subsequent siblings)
6 siblings, 0 replies; 9+ messages in thread
From: linux @ 2024-10-06 1:19 UTC (permalink / raw)
To: xiubli, idryomov, ceph-devel; +Cc: linux-kernel, Dr. David Alan Gilbert
From: "Dr. David Alan Gilbert" <linux@treblig.org>
ceph_crypto_key_encode() was added in 2010's commit
8b6e4f2d8b21 ("ceph: aes crypto and base64 encode/decode helpers")
but has remained unused (the decode is used).
Remove it.
Signed-off-by: Dr. David Alan Gilbert <linux@treblig.org>
---
net/ceph/crypto.c | 12 ------------
net/ceph/crypto.h | 1 -
2 files changed, 13 deletions(-)
diff --git a/net/ceph/crypto.c b/net/ceph/crypto.c
index 051d22c0e4ad..01b2ce1e8fc0 100644
--- a/net/ceph/crypto.c
+++ b/net/ceph/crypto.c
@@ -74,18 +74,6 @@ int ceph_crypto_key_clone(struct ceph_crypto_key *dst,
return set_secret(dst, src->key);
}
-int ceph_crypto_key_encode(struct ceph_crypto_key *key, void **p, void *end)
-{
- if (*p + sizeof(u16) + sizeof(key->created) +
- sizeof(u16) + key->len > end)
- return -ERANGE;
- ceph_encode_16(p, key->type);
- ceph_encode_copy(p, &key->created, sizeof(key->created));
- ceph_encode_16(p, key->len);
- ceph_encode_copy(p, key->key, key->len);
- return 0;
-}
-
int ceph_crypto_key_decode(struct ceph_crypto_key *key, void **p, void *end)
{
int ret;
diff --git a/net/ceph/crypto.h b/net/ceph/crypto.h
index 13bd526349fa..23de29fc613c 100644
--- a/net/ceph/crypto.h
+++ b/net/ceph/crypto.h
@@ -21,7 +21,6 @@ struct ceph_crypto_key {
int ceph_crypto_key_clone(struct ceph_crypto_key *dst,
const struct ceph_crypto_key *src);
-int ceph_crypto_key_encode(struct ceph_crypto_key *key, void **p, void *end);
int ceph_crypto_key_decode(struct ceph_crypto_key *key, void **p, void *end);
int ceph_crypto_key_unarmor(struct ceph_crypto_key *key, const char *in);
void ceph_crypto_key_destroy(struct ceph_crypto_key *key);
--
2.46.2
^ permalink raw reply [flat|nested] 9+ messages in thread* [PATCH 5/5] ceph: Remove fs/ceph deadcode
2024-10-06 1:19 [PATCH 0/5] Ceph deadcoding linux
` (3 preceding siblings ...)
2024-10-06 1:19 ` [PATCH 4/5] libceph: Remove unused ceph_crypto_key_encode linux
@ 2024-10-06 1:19 ` linux
2024-10-27 19:53 ` [PATCH 0/5] Ceph deadcoding Ilya Dryomov
2024-10-27 20:16 ` Ilya Dryomov
6 siblings, 0 replies; 9+ messages in thread
From: linux @ 2024-10-06 1:19 UTC (permalink / raw)
To: xiubli, idryomov, ceph-devel; +Cc: linux-kernel, Dr. David Alan Gilbert
From: "Dr. David Alan Gilbert" <linux@treblig.org>
ceph_caps_revoking() has been unused since 2017's commit
3fb99d483e61 ("ceph: nuke startsync op")
ceph_mdsc_open_export_target_sessions() has been unused since 2013's
commit 11df2dfb610d ("ceph: add imported caps when handling cap export message")
Remove them.
Signed-off-by: Dr. David Alan Gilbert <linux@treblig.org>
---
fs/ceph/caps.c | 14 --------------
fs/ceph/mds_client.c | 8 --------
fs/ceph/mds_client.h | 2 --
fs/ceph/super.h | 1 -
4 files changed, 25 deletions(-)
diff --git a/fs/ceph/caps.c b/fs/ceph/caps.c
index bed34fc11c91..0d6b2c0269bf 100644
--- a/fs/ceph/caps.c
+++ b/fs/ceph/caps.c
@@ -978,20 +978,6 @@ int __ceph_caps_revoking_other(struct ceph_inode_info *ci,
return 0;
}
-int ceph_caps_revoking(struct ceph_inode_info *ci, int mask)
-{
- struct inode *inode = &ci->netfs.inode;
- struct ceph_client *cl = ceph_inode_to_client(inode);
- int ret;
-
- spin_lock(&ci->i_ceph_lock);
- ret = __ceph_caps_revoking_other(ci, NULL, mask);
- spin_unlock(&ci->i_ceph_lock);
- doutc(cl, "%p %llx.%llx %s = %d\n", inode, ceph_vinop(inode),
- ceph_cap_string(mask), ret);
- return ret;
-}
-
int __ceph_caps_used(struct ceph_inode_info *ci)
{
int used = 0;
diff --git a/fs/ceph/mds_client.c b/fs/ceph/mds_client.c
index c4a5fd94bbbb..923635532f03 100644
--- a/fs/ceph/mds_client.c
+++ b/fs/ceph/mds_client.c
@@ -1747,14 +1747,6 @@ static void __open_export_target_sessions(struct ceph_mds_client *mdsc,
}
}
-void ceph_mdsc_open_export_target_sessions(struct ceph_mds_client *mdsc,
- struct ceph_mds_session *session)
-{
- mutex_lock(&mdsc->mutex);
- __open_export_target_sessions(mdsc, session);
- mutex_unlock(&mdsc->mutex);
-}
-
/*
* session caps
*/
diff --git a/fs/ceph/mds_client.h b/fs/ceph/mds_client.h
index 3dd54587944a..38bb7e0d2d79 100644
--- a/fs/ceph/mds_client.h
+++ b/fs/ceph/mds_client.h
@@ -634,8 +634,6 @@ extern void ceph_mdsc_handle_fsmap(struct ceph_mds_client *mdsc,
extern struct ceph_mds_session *
ceph_mdsc_open_export_target_session(struct ceph_mds_client *mdsc, int target);
-extern void ceph_mdsc_open_export_target_sessions(struct ceph_mds_client *mdsc,
- struct ceph_mds_session *session);
extern int ceph_trim_caps(struct ceph_mds_client *mdsc,
struct ceph_mds_session *session,
diff --git a/fs/ceph/super.h b/fs/ceph/super.h
index 037eac35a9e0..b0b15e87251d 100644
--- a/fs/ceph/super.h
+++ b/fs/ceph/super.h
@@ -796,7 +796,6 @@ extern int __ceph_mark_dirty_caps(struct ceph_inode_info *ci, int mask,
extern int __ceph_caps_revoking_other(struct ceph_inode_info *ci,
struct ceph_cap *ocap, int mask);
-extern int ceph_caps_revoking(struct ceph_inode_info *ci, int mask);
extern int __ceph_caps_used(struct ceph_inode_info *ci);
static inline bool __ceph_is_file_opened(struct ceph_inode_info *ci)
--
2.46.2
^ permalink raw reply [flat|nested] 9+ messages in thread* Re: [PATCH 0/5] Ceph deadcoding
2024-10-06 1:19 [PATCH 0/5] Ceph deadcoding linux
` (4 preceding siblings ...)
2024-10-06 1:19 ` [PATCH 5/5] ceph: Remove fs/ceph deadcode linux
@ 2024-10-27 19:53 ` Ilya Dryomov
2024-10-27 20:16 ` Ilya Dryomov
6 siblings, 0 replies; 9+ messages in thread
From: Ilya Dryomov @ 2024-10-27 19:53 UTC (permalink / raw)
To: linux; +Cc: xiubli, ceph-devel, linux-kernel
On Sun, Oct 6, 2024 at 3:19 AM <linux@treblig.org> wrote:
>
> From: "Dr. David Alan Gilbert" <linux@treblig.org>
>
> Hi,
> This series is a set of deadcoding in fs/ceph and net/ceph.
> It's strictly function deletion so should have no change
> in behaviour.
>
> (get_maintainer was suggesting the netdev team as well
> as ceph? Is that correct???)
>
> Build & boot tested on x86-64.
>
> Dave
>
> Dr. David Alan Gilbert (5):
> libceph: Remove unused ceph_pagelist functions
> libceph: Remove unused pagevec functions
> libceph: Remove unused ceph_osdc_watch_check
> libceph: Remove unused ceph_crypto_key_encode
> ceph: Remove fs/ceph deadcode
>
> fs/ceph/caps.c | 14 ---------
> fs/ceph/mds_client.c | 8 -----
> fs/ceph/mds_client.h | 2 --
> fs/ceph/super.h | 1 -
> include/linux/ceph/libceph.h | 6 ----
> include/linux/ceph/osd_client.h | 2 --
> include/linux/ceph/pagelist.h | 12 --------
> net/ceph/crypto.c | 12 --------
> net/ceph/crypto.h | 1 -
> net/ceph/osd_client.c | 34 ---------------------
> net/ceph/pagelist.c | 38 ------------------------
> net/ceph/pagevec.c | 52 ---------------------------------
> 12 files changed, 182 deletions(-)
Applied.
Thanks,
Ilya
^ permalink raw reply [flat|nested] 9+ messages in thread* Re: [PATCH 0/5] Ceph deadcoding
2024-10-06 1:19 [PATCH 0/5] Ceph deadcoding linux
` (5 preceding siblings ...)
2024-10-27 19:53 ` [PATCH 0/5] Ceph deadcoding Ilya Dryomov
@ 2024-10-27 20:16 ` Ilya Dryomov
2024-10-27 20:45 ` Dr. David Alan Gilbert
6 siblings, 1 reply; 9+ messages in thread
From: Ilya Dryomov @ 2024-10-27 20:16 UTC (permalink / raw)
To: linux; +Cc: xiubli, ceph-devel, linux-kernel
On Sun, Oct 6, 2024 at 3:19 AM <linux@treblig.org> wrote:
>
> From: "Dr. David Alan Gilbert" <linux@treblig.org>
>
> Hi,
> This series is a set of deadcoding in fs/ceph and net/ceph.
> It's strictly function deletion so should have no change
> in behaviour.
>
> (get_maintainer was suggesting the netdev team as well
> as ceph? Is that correct???)
Hi David,
No, it's not correct. It's probably caused by
F: net/
entry in "NETWORKING [GENERAL]" section. I don't recall
get_maintainer.pl doing that in the past, but I could be wrong.
Anyway, I'll send a patch to exclude net/ceph there.
Thanks,
Ilya
^ permalink raw reply [flat|nested] 9+ messages in thread* Re: [PATCH 0/5] Ceph deadcoding
2024-10-27 20:16 ` Ilya Dryomov
@ 2024-10-27 20:45 ` Dr. David Alan Gilbert
0 siblings, 0 replies; 9+ messages in thread
From: Dr. David Alan Gilbert @ 2024-10-27 20:45 UTC (permalink / raw)
To: Ilya Dryomov; +Cc: xiubli, ceph-devel, linux-kernel
* Ilya Dryomov (idryomov@gmail.com) wrote:
> On Sun, Oct 6, 2024 at 3:19 AM <linux@treblig.org> wrote:
> >
> > From: "Dr. David Alan Gilbert" <linux@treblig.org>
> >
> > Hi,
> > This series is a set of deadcoding in fs/ceph and net/ceph.
> > It's strictly function deletion so should have no change
> > in behaviour.
> >
> > (get_maintainer was suggesting the netdev team as well
> > as ceph? Is that correct???)
>
> Hi David,
>
> No, it's not correct. It's probably caused by
>
> F: net/
>
> entry in "NETWORKING [GENERAL]" section. I don't recall
> get_maintainer.pl doing that in the past, but I could be wrong.
THanks, I didn't think it was right.
> Anyway, I'll send a patch to exclude net/ceph there.
Thanks, and thanks for applying the cleanup.
Dave
> Thanks,
>
> Ilya
>
--
-----Open up your eyes, open up your mind, open up your code -------
/ Dr. David Alan Gilbert | Running GNU/Linux | Happy \
\ dave @ treblig.org | | In Hex /
\ _________________________|_____ http://www.treblig.org |_______/
^ permalink raw reply [flat|nested] 9+ messages in thread