Commit 00a126be authored by Weifeng Su's avatar Weifeng Su Committed by Tomasz Zawadzki
Browse files

lib/env_dpdk: Change the location of lock files from /tmp to /var/tmp 



Move the lock files from '/tmp' to '/var/tmp' cause user maybe delete files in /tmp
or remount /tmp by mistake, And the JSON-RPC domain socket located in '/var/tmp' also.

Signed-off-by: default avatarWeifeng Su <suweifeng1@huawei.com>
Signed-off-by: default avatarShihao Sun <sunshihao@huawei.com>
Change-Id: I18d52f42462e8477fb35aeea9e38efc51610d17c
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/5096


Community-CI: Broadcom CI
Reviewed-by: default avatarChangpeng Liu <changpeng.liu@intel.com>
Reviewed-by: default avatarAleksey Marchuk <alexeymar@mellanox.com>
Reviewed-by: default avatarShuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
parent 5e01bdb4

lib/env_dpdk/pci.c

+2 −2
Original line number Diff line number Diff line
@@ -920,7 +920,7 @@ spdk_pci_device_claim(struct spdk_pci_device *dev) 
		.l_len = 0,

	};



	snprintf(dev_name, sizeof(dev_name), "/tmp/spdk_pci_lock_%04x:%02x:%02x.%x",

	snprintf(dev_name, sizeof(dev_name), "/var/tmp/spdk_pci_lock_%04x:%02x:%02x.%x",

		 dev->addr.domain, dev->addr.bus, dev->addr.dev, dev->addr.func);



	dev_fd = open(dev_name, O_RDWR | O_CREAT, S_IRUSR | S_IWUSR);
@@ -965,7 +965,7 @@ spdk_pci_device_unclaim(struct spdk_pci_device *dev) 
{

	char dev_name[64];



	snprintf(dev_name, sizeof(dev_name), "/tmp/spdk_pci_lock_%04x:%02x:%02x.%x",

	snprintf(dev_name, sizeof(dev_name), "/var/tmp/spdk_pci_lock_%04x:%02x:%02x.%x",

		 dev->addr.domain, dev->addr.bus, dev->addr.dev, dev->addr.func);



	close(dev->internal.claim_fd);

lib/nvme/nvme_cuse.c

+1 −1
Original line number Diff line number Diff line
@@ -756,7 +756,7 @@ nvme_cuse_claim(struct cuse_device *ctrlr_device, uint32_t index) 
	};



	snprintf(ctrlr_device->lock_name, sizeof(ctrlr_device->lock_name),

		 "/tmp/spdk_nvme_cuse_lock_%" PRIu32, index);

		 "/var/tmp/spdk_nvme_cuse_lock_%" PRIu32, index);



	dev_fd = open(ctrlr_device->lock_name, O_RDWR | O_CREAT, S_IRUSR | S_IWUSR);

	if (dev_fd == -1) {