From a96da1c3fb6b7fce0054cc44bb57a7245be57468 Mon Sep 17 00:00:00 2001
From: Conrad Meyer <cem@FreeBSD.org>
Date: Wed, 5 Apr 2017 01:44:03 +0000
Subject: [PATCH] ufs: Export UFS_MAXNAMLEN to pathconf, statfs
Rather than the global NAME_MAX constant. This change is required to
support systems with a NAME_MAX/MAXNAMLEN that differs from UFS_MAXNAMLEN.
This was missed in r313475 due to the alternative spelling ("NAME_MAX") of
MAXNAMLEN. This change is also similar in spirit to r313780.
Reported by: ngie@
Sponsored by: Dell EMC Isilon
---
sys/ufs/ffs/ffs_vfsops.c | 3 ++-
sys/ufs/ufs/ufs_vnops.c | 2 +-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/sys/ufs/ffs/ffs_vfsops.c b/sys/ufs/ffs/ffs_vfsops.c
index abb0b47d984d..685c42ec161e 100644
--- a/sys/ufs/ffs/ffs_vfsops.c
+++ b/sys/ufs/ffs/ffs_vfsops.c
@@ -57,6 +57,7 @@ __FBSDID("$FreeBSD$");
#include <security/mac/mac_framework.h>
+#include <ufs/ufs/dir.h>
#include <ufs/ufs/extattr.h>
#include <ufs/ufs/gjournal.h>
#include <ufs/ufs/quota.h>
@@ -1434,7 +1435,7 @@ ffs_statfs(mp, sbp)
sbp->f_files = fs->fs_ncg * fs->fs_ipg - UFS_ROOTINO;
sbp->f_ffree = fs->fs_cstotal.cs_nifree + fs->fs_pendinginodes;
UFS_UNLOCK(ump);
- sbp->f_namemax = NAME_MAX;
+ sbp->f_namemax = UFS_MAXNAMLEN;
return (0);
}
diff --git a/sys/ufs/ufs/ufs_vnops.c b/sys/ufs/ufs/ufs_vnops.c
index c3616f19e242..a859fb8032f2 100644
--- a/sys/ufs/ufs/ufs_vnops.c
+++ b/sys/ufs/ufs/ufs_vnops.c
@@ -2446,7 +2446,7 @@ ufs_pathconf(ap)
*ap->a_retval = LINK_MAX;
break;
case _PC_NAME_MAX:
- *ap->a_retval = NAME_MAX;
+ *ap->a_retval = UFS_MAXNAMLEN;
break;
case _PC_PATH_MAX:
*ap->a_retval = PATH_MAX;