Merge tag 'kbuild-v5.13-2' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy...

[linux-2.6-microblaze.git] / drivers / block / rnbd / rnbd-srv.c

diff --git a/drivers/block/rnbd/rnbd-srv.c b/drivers/block/rnbd/rnbd-srv.c
index abacd9e..aafecfe 100644 (file)
--- a/drivers/block/rnbd/rnbd-srv.c
+++ b/drivers/block/rnbd/rnbd-srv.c
@@ -104,7 +104,7 @@ rnbd_get_sess_dev(int dev_id, struct rnbd_srv_session *srv_sess)
 
        rcu_read_lock();
        sess_dev = xa_load(&srv_sess->index_idr, dev_id);
-       if (likely(sess_dev))
+       if (sess_dev)
                ret = kref_get_unless_zero(&sess_dev->kref);
        rcu_read_unlock();
 
@@ -298,7 +298,7 @@ static int create_sess(struct rtrs_srv *rtrs)
        mutex_unlock(&sess_lock);
 
        srv_sess->rtrs = rtrs;
-       strlcpy(srv_sess->sessname, sessname, sizeof(srv_sess->sessname));
+       strscpy(srv_sess->sessname, sessname, sizeof(srv_sess->sessname));
 
        rtrs_srv_set_sess_priv(rtrs, srv_sess);
 
@@ -437,7 +437,7 @@ static struct rnbd_srv_dev *rnbd_srv_init_srv_dev(const char *id)
        if (!dev)
                return ERR_PTR(-ENOMEM);
 
-       strlcpy(dev->id, id, sizeof(dev->id));
+       strscpy(dev->id, id, sizeof(dev->id));
        kref_init(&dev->kref);
        INIT_LIST_HEAD(&dev->sess_dev_list);
        mutex_init(&dev->lock);
@@ -589,7 +589,7 @@ rnbd_srv_create_set_sess_dev(struct rnbd_srv_session *srv_sess,
 
        kref_init(&sdev->kref);
 
-       strlcpy(sdev->pathname, open_msg->dev_name, sizeof(sdev->pathname));
+       strscpy(sdev->pathname, open_msg->dev_name, sizeof(sdev->pathname));
 
        sdev->rnbd_dev          = rnbd_dev;
        sdev->sess              = srv_sess;