aboutsummaryrefslogtreecommitdiff
path: root/sys/gnu
diff options
context:
space:
mode:
Diffstat (limited to 'sys/gnu')
-rw-r--r--sys/gnu/fs/xfs/FreeBSD/xfs_ioctl.c4
-rw-r--r--sys/gnu/fs/xfs/FreeBSD/xfs_stats.c2
-rw-r--r--sys/gnu/fs/xfs/FreeBSD/xfs_super.c2
-rw-r--r--sys/gnu/fs/xfs/xfs_alloc.c4
-rw-r--r--sys/gnu/fs/xfs/xfs_vfsops.c2
5 files changed, 6 insertions, 8 deletions
diff --git a/sys/gnu/fs/xfs/FreeBSD/xfs_ioctl.c b/sys/gnu/fs/xfs/FreeBSD/xfs_ioctl.c
index 97c4c72af9ef..ff5582c2d590 100644
--- a/sys/gnu/fs/xfs/FreeBSD/xfs_ioctl.c
+++ b/sys/gnu/fs/xfs/FreeBSD/xfs_ioctl.c
@@ -1249,7 +1249,6 @@ xfs_ioc_xattr(
XFS_AT_NEXTENTS | XFS_AT_PROJID;
XVOP_GETATTR(vp, vattr, 0, NULL, error);
if (unlikely(error)) {
- error = error;
break;
}
@@ -1287,7 +1286,6 @@ xfs_ioc_xattr(
if (likely(!error))
__vn_revalidate(vp, vattr); /* update flags */
#endif
- error = error;
break;
}
@@ -1296,7 +1294,6 @@ xfs_ioc_xattr(
XFS_AT_ANEXTENTS | XFS_AT_PROJID;
XVOP_GETATTR(vp, vattr, 0, NULL, error);
if (unlikely(error)) {
- error = error;
break;
}
@@ -1347,7 +1344,6 @@ xfs_ioc_xattr(
if (likely(!error))
__vn_revalidate(vp, vattr); /* update flags */
#endif
- error = error;
break;
}
diff --git a/sys/gnu/fs/xfs/FreeBSD/xfs_stats.c b/sys/gnu/fs/xfs/FreeBSD/xfs_stats.c
index 04582ee77d1e..40b30568e845 100644
--- a/sys/gnu/fs/xfs/FreeBSD/xfs_stats.c
+++ b/sys/gnu/fs/xfs/FreeBSD/xfs_stats.c
@@ -65,7 +65,7 @@ xfs_read_xfsstats(
};
for (i=j=len = 0; i < sizeof(xstats)/sizeof(struct xstats_entry); i++) {
- len += sprintf(buffer + len, xstats[i].desc);
+ len += sprintf(buffer + len, "%s", xstats[i].desc);
/* inner loop does each group */
while (j < xstats[i].endpoint) {
len += sprintf(buffer + len, " %u",
diff --git a/sys/gnu/fs/xfs/FreeBSD/xfs_super.c b/sys/gnu/fs/xfs/FreeBSD/xfs_super.c
index 899a41c0c6f1..747a5dae2620 100644
--- a/sys/gnu/fs/xfs/FreeBSD/xfs_super.c
+++ b/sys/gnu/fs/xfs/FreeBSD/xfs_super.c
@@ -251,7 +251,7 @@ xfs_blkdev_issue_flush(
int
init_xfs_fs( void )
{
- static char message[] =
+ static const char message[] =
XFS_VERSION_STRING " with " XFS_BUILD_OPTIONS " enabled\n";
printf(message);
diff --git a/sys/gnu/fs/xfs/xfs_alloc.c b/sys/gnu/fs/xfs/xfs_alloc.c
index 64ee07db0d5e..1c2f50e77319 100644
--- a/sys/gnu/fs/xfs/xfs_alloc.c
+++ b/sys/gnu/fs/xfs/xfs_alloc.c
@@ -1479,8 +1479,10 @@ xfs_alloc_ag_vextent_small(
/*
* Can't allocate from the freelist for some reason.
*/
- else
+ else {
+ fbno = NULLAGBLOCK;
flen = 0;
+ }
/*
* Can't do the allocation, give up.
*/
diff --git a/sys/gnu/fs/xfs/xfs_vfsops.c b/sys/gnu/fs/xfs/xfs_vfsops.c
index e97a36399a0e..b073a8e2a5d3 100644
--- a/sys/gnu/fs/xfs/xfs_vfsops.c
+++ b/sys/gnu/fs/xfs/xfs_vfsops.c
@@ -1954,7 +1954,7 @@ xfs_showargs(
for (xfs_infop = xfs_info; xfs_infop->flag; xfs_infop++) {
if (mp->m_flags & xfs_infop->flag)
- sbuf_printf(m, xfs_infop->str);
+ sbuf_printf(m, "%s", xfs_infop->str);
}
if (mp->m_flags & XFS_MOUNT_IHASHSIZE)