ksmbd: Remove unused functions

ksmbd_rpc_rap() was added in 2021 as part of
commit 0626e6641f6b ("cifsd: add server handler for central processing and
tranport layers")

ksmbd_vfs_posix_lock_wait_timeout() was added in 2021 as part of
commit f44158485826 ("cifsd: add file operations")

both have remained unused.

Remove them.

Signed-off-by: Dr. David Alan Gilbert <[email protected]>
Acked-by: Namjae Jeon <[email protected]>
Signed-off-by: Steve French <[email protected]>

diff --git a/fs/smb/server/transport_ipc.c b/fs/smb/server/transport_ipc.c
index befaf42b84cc347270c5fd22c40f6bc569d49326..e5049ea1d8b2e61532920f959cb1527b1ee2db72 100644 (file)
--- a/fs/smb/server/transport_ipc.c
+++ b/fs/smb/server/transport_ipc.c
@@ -871,31 +871,6 @@ struct ksmbd_rpc_command *ksmbd_rpc_ioctl(struct ksmbd_session *sess, int handle
        return resp;
 }
 
-struct ksmbd_rpc_command *ksmbd_rpc_rap(struct ksmbd_session *sess, void *payload,
-                                       size_t payload_sz)
-{
-       struct ksmbd_ipc_msg *msg;
-       struct ksmbd_rpc_command *req;
-       struct ksmbd_rpc_command *resp;
-
-       msg = ipc_msg_alloc(sizeof(struct ksmbd_rpc_command) + payload_sz + 1);
-       if (!msg)
-               return NULL;
-
-       msg->type = KSMBD_EVENT_RPC_REQUEST;
-       req = (struct ksmbd_rpc_command *)msg->payload;
-       req->handle = ksmbd_acquire_id(&ipc_ida);
-       req->flags = rpc_context_flags(sess);
-       req->flags |= KSMBD_RPC_RAP_METHOD;
-       req->payload_sz = payload_sz;
-       memcpy(req->payload, payload, payload_sz);
-
-       resp = ipc_msg_send_request(msg, req->handle);
-       ipc_msg_handle_free(req->handle);
-       ipc_msg_free(msg);
-       return resp;
-}
-
 static int __ipc_heartbeat(void)
 {
        unsigned long delta;

diff --git a/fs/smb/server/transport_ipc.h b/fs/smb/server/transport_ipc.h
index d9b6737f8cd03d49c657edcee859b9a1b5f2a99d..e51850f1423ba55c2c696844a59cb0ddab022961 100644 (file)
--- a/fs/smb/server/transport_ipc.h
+++ b/fs/smb/server/transport_ipc.h
@@ -41,8 +41,6 @@ struct ksmbd_rpc_command *ksmbd_rpc_write(struct ksmbd_session *sess, int handle
 struct ksmbd_rpc_command *ksmbd_rpc_read(struct ksmbd_session *sess, int handle);
 struct ksmbd_rpc_command *ksmbd_rpc_ioctl(struct ksmbd_session *sess, int handle,
                                          void *payload, size_t payload_sz);
-struct ksmbd_rpc_command *ksmbd_rpc_rap(struct ksmbd_session *sess, void *payload,
-                                       size_t payload_sz);
 void ksmbd_ipc_release(void);
 void ksmbd_ipc_soft_reset(void);
 int ksmbd_ipc_init(void);

diff --git a/fs/smb/server/vfs.c b/fs/smb/server/vfs.c
index 40f08eac519c7a509a629afc6fe262fc61b27e03..6890016e1923ed4f7dc1eeb5d83fe56650edc1df 100644 (file)
--- a/fs/smb/server/vfs.c
+++ b/fs/smb/server/vfs.c
@@ -1856,13 +1856,6 @@ void ksmbd_vfs_posix_lock_wait(struct file_lock *flock)
        wait_event(flock->c.flc_wait, !flock->c.flc_blocker);
 }
 
-int ksmbd_vfs_posix_lock_wait_timeout(struct file_lock *flock, long timeout)
-{
-       return wait_event_interruptible_timeout(flock->c.flc_wait,
-                                               !flock->c.flc_blocker,
-                                               timeout);
-}
-
 void ksmbd_vfs_posix_lock_unblock(struct file_lock *flock)
 {
        locks_delete_block(flock);

diff --git a/fs/smb/server/vfs.h b/fs/smb/server/vfs.h
index 06903024a2d88b367982f08b0eaf1609f73b6f5a..2893f59803a6d2cbe464e5ad75b6a7c185506a68 100644 (file)
--- a/fs/smb/server/vfs.h
+++ b/fs/smb/server/vfs.h
@@ -140,7 +140,6 @@ int ksmbd_vfs_fill_dentry_attrs(struct ksmbd_work *work,
                                struct dentry *dentry,
                                struct ksmbd_kstat *ksmbd_kstat);
 void ksmbd_vfs_posix_lock_wait(struct file_lock *flock);
-int ksmbd_vfs_posix_lock_wait_timeout(struct file_lock *flock, long timeout);
 void ksmbd_vfs_posix_lock_unblock(struct file_lock *flock);
 int ksmbd_vfs_remove_acl_xattrs(struct mnt_idmap *idmap,
                                const struct path *path);