rpms/nfs-utils
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Updated the nfs-utils-2.3.2-rc1.patch with the latest upstream bits.

Browse Source 
Signed-off-by: Steve Dickson <steved@redhat.com>
This commit is contained in:
Steve Dickson 2018-03-10 13:11:58 -05:00
parent e81baf7d7a
commit 595d9d2f5e
1 changed files with 32 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
nfs-utils-2.3.2-rc1.patch
View File

@ -4527,7 +4527,7 @@ index cae8c8d..3a202e0 100644
signal(SIGINT, sig_die);
diff --git a/utils/blkmapd/dm-device.c b/utils/blkmapd/dm-device.c
index 24ffcbf..f2d4de4 100644
index 24ffcbf..ee20d54 100644
--- a/utils/blkmapd/dm-device.c
+++ b/utils/blkmapd/dm-device.c
@@ -210,7 +210,7 @@ static int dm_device_remove_byname(const char *dev_name)
@ -4539,6 +4539,37 @@ index 24ffcbf..f2d4de4 100644
{
struct dm_task *dmt;
struct dm_names *dmnames;
@@ -400,15 +400,17 @@ uint64_t dm_device_create(struct bl_volume *vols, int num_vols)
}
dev = node->bv_vols[0]->param.bv_dev;
tmp = table->params;
- BL_LOG_INFO("%s: major %lu minor %lu", __func__,
- MAJOR(dev), MINOR(dev));
+ BL_LOG_INFO("%s: major %llu minor %llu", __func__,
+ (long long unsigned)MAJOR(dev),
+ (long long unsigned)MINOR(dev));
if (!dm_format_dev(tmp, DM_PARAMS_LEN,
MAJOR(dev), MINOR(dev))) {
free(table);
goto out;
}
tmp += strlen(tmp);
- sprintf(tmp, " %lu", node->param.bv_offset);
+ sprintf(tmp, " %llu",
+ (long long unsigned)node->param.bv_offset);
add_to_bl_dm_table(&bl_table_head, table);
break;
case BLOCK_VOLUME_STRIPE:
@@ -462,7 +464,8 @@ uint64_t dm_device_create(struct bl_volume *vols, int num_vols)
tmp = table->params;
dev = node->bv_vols[i]->param.bv_dev;
BL_LOG_INFO("%s: major %lu minor %lu", __func__,
- MAJOR(dev), MINOR(dev));
+ (long unsigned int)MAJOR(dev),
+ (long unsigned int)MINOR(dev));
if (!dm_format_dev(tmp, DM_PARAMS_LEN,
MAJOR(dev), MINOR(dev))) {
free(table);
diff --git a/utils/exportfs/exportfs.c b/utils/exportfs/exportfs.c
index 448f195..cd3c979 100644
--- a/utils/exportfs/exportfs.c