Merge remote-tracking branch 'scsi/for-next'

[deliverable/linux.git] / drivers / scsi / cxlflash / vlun.c

diff --git a/drivers/scsi/cxlflash/vlun.c b/drivers/scsi/cxlflash/vlun.c
index 50f8e93007704667fb0c1311834c0a5f0d50ff52..90c5d7f5278e2350c4b65098c6a3124d76fd7f6c 100644 (file)
--- a/drivers/scsi/cxlflash/vlun.c
+++ b/drivers/scsi/cxlflash/vlun.c
@@ -1135,14 +1135,13 @@ int cxlflash_disk_clone(struct scsi_device *sdev,
            ctxid_dst = DECODE_CTXID(clone->context_id_dst),
            rctxid_src = clone->context_id_src,
            rctxid_dst = clone->context_id_dst;
-       int adap_fd_src = clone->adap_fd_src;
        int i, j;
        int rc = 0;
        bool found;
        LIST_HEAD(sidecar);
 
-       pr_debug("%s: ctxid_src=%llu ctxid_dst=%llu adap_fd_src=%d\n",
-                __func__, ctxid_src, ctxid_dst, adap_fd_src);
+       pr_debug("%s: ctxid_src=%llu ctxid_dst=%llu\n",
+                __func__, ctxid_src, ctxid_dst);
 
        /* Do not clone yourself */
        if (unlikely(rctxid_src == rctxid_dst)) {
@@ -1166,13 +1165,6 @@ int cxlflash_disk_clone(struct scsi_device *sdev,
                goto out;
        }
 
-       if (unlikely(adap_fd_src != ctxi_src->lfd)) {
-               pr_debug("%s: Invalid source adapter fd! (%d)\n",
-                        __func__, adap_fd_src);
-               rc = -EINVAL;
-               goto out;
-       }
-
        /* Verify there is no open resource handle in the destination context */
        for (i = 0; i < MAX_RHT_PER_CONTEXT; i++)
                if (ctxi_dst->rht_start[i].nmask != 0) {
@@ -1257,7 +1249,6 @@ int cxlflash_disk_clone(struct scsi_device *sdev,
 
 out_success:
        list_splice(&sidecar, &ctxi_dst->luns);
-       sys_close(adap_fd_src);
 
        /* fall through */
 out: