Skip to content

Commit fe4b418

Browse files
Dr. David Alan GilbertSteve French
authored andcommitted
ksmbd: Remove unused functions
ksmbd_rpc_rap() was added in 2021 as part of commit 0626e66 ("cifsd: add server handler for central processing and tranport layers") ksmbd_vfs_posix_lock_wait_timeout() was added in 2021 as part of commit f441584 ("cifsd: add file operations") both have remained unused. Remove them. Signed-off-by: Dr. David Alan Gilbert <linux@treblig.org> Acked-by: Namjae Jeon <linkinjeon@kernel.org> Signed-off-by: Steve French <stfrench@microsoft.com>
1 parent 5bc55a3 commit fe4b418

File tree

4 files changed

+0
-35
lines changed

4 files changed

+0
-35
lines changed

fs/smb/server/transport_ipc.c

Lines changed: 0 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -871,31 +871,6 @@ struct ksmbd_rpc_command *ksmbd_rpc_ioctl(struct ksmbd_session *sess, int handle
871871
return resp;
872872
}
873873

874-
struct ksmbd_rpc_command *ksmbd_rpc_rap(struct ksmbd_session *sess, void *payload,
875-
size_t payload_sz)
876-
{
877-
struct ksmbd_ipc_msg *msg;
878-
struct ksmbd_rpc_command *req;
879-
struct ksmbd_rpc_command *resp;
880-
881-
msg = ipc_msg_alloc(sizeof(struct ksmbd_rpc_command) + payload_sz + 1);
882-
if (!msg)
883-
return NULL;
884-
885-
msg->type = KSMBD_EVENT_RPC_REQUEST;
886-
req = (struct ksmbd_rpc_command *)msg->payload;
887-
req->handle = ksmbd_acquire_id(&ipc_ida);
888-
req->flags = rpc_context_flags(sess);
889-
req->flags |= KSMBD_RPC_RAP_METHOD;
890-
req->payload_sz = payload_sz;
891-
memcpy(req->payload, payload, payload_sz);
892-
893-
resp = ipc_msg_send_request(msg, req->handle);
894-
ipc_msg_handle_free(req->handle);
895-
ipc_msg_free(msg);
896-
return resp;
897-
}
898-
899874
static int __ipc_heartbeat(void)
900875
{
901876
unsigned long delta;

fs/smb/server/transport_ipc.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,6 @@ struct ksmbd_rpc_command *ksmbd_rpc_write(struct ksmbd_session *sess, int handle
4141
struct ksmbd_rpc_command *ksmbd_rpc_read(struct ksmbd_session *sess, int handle);
4242
struct ksmbd_rpc_command *ksmbd_rpc_ioctl(struct ksmbd_session *sess, int handle,
4343
void *payload, size_t payload_sz);
44-
struct ksmbd_rpc_command *ksmbd_rpc_rap(struct ksmbd_session *sess, void *payload,
45-
size_t payload_sz);
4644
void ksmbd_ipc_release(void);
4745
void ksmbd_ipc_soft_reset(void);
4846
int ksmbd_ipc_init(void);

fs/smb/server/vfs.c

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1856,13 +1856,6 @@ void ksmbd_vfs_posix_lock_wait(struct file_lock *flock)
18561856
wait_event(flock->c.flc_wait, !flock->c.flc_blocker);
18571857
}
18581858

1859-
int ksmbd_vfs_posix_lock_wait_timeout(struct file_lock *flock, long timeout)
1860-
{
1861-
return wait_event_interruptible_timeout(flock->c.flc_wait,
1862-
!flock->c.flc_blocker,
1863-
timeout);
1864-
}
1865-
18661859
void ksmbd_vfs_posix_lock_unblock(struct file_lock *flock)
18671860
{
18681861
locks_delete_block(flock);

fs/smb/server/vfs.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,6 @@ int ksmbd_vfs_fill_dentry_attrs(struct ksmbd_work *work,
140140
struct dentry *dentry,
141141
struct ksmbd_kstat *ksmbd_kstat);
142142
void ksmbd_vfs_posix_lock_wait(struct file_lock *flock);
143-
int ksmbd_vfs_posix_lock_wait_timeout(struct file_lock *flock, long timeout);
144143
void ksmbd_vfs_posix_lock_unblock(struct file_lock *flock);
145144
int ksmbd_vfs_remove_acl_xattrs(struct mnt_idmap *idmap,
146145
const struct path *path);

0 commit comments

Comments
 (0)