mirror of
https://git.proxmox.com/git/mirror_zfs.git
synced 2024-12-26 19:19:32 +03:00
02730c333c
Enable picky cstyle checks and resolve the new warnings. The vast
majority of the changes needed were to handle minor issues with
whitespace formatting. This patch contains no functional changes.
Non-whitespace changes are as follows:
* 8 times ; to { } in for/while loop
* fix missing ; in cmd/zed/agents/zfs_diagnosis.c
* comment (confim -> confirm)
* change endline , to ; in cmd/zpool/zpool_main.c
* a number of /* BEGIN CSTYLED */ /* END CSTYLED */ blocks
* /* CSTYLED */ markers
* change == 0 to !
* ulong to unsigned long in module/zfs/dsl_scan.c
* rearrangement of module_param lines in module/zfs/metaslab.c
* add { } block around statement after for_each_online_node
Reviewed-by: Giuseppe Di Natale <dinatale2@llnl.gov>
Reviewed-by: Håkan Johansson <f96hajo@chalmers.se>
Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
Closes #5465
102 lines
2.3 KiB
C
102 lines
2.3 KiB
C
/*
|
|
* CDDL HEADER START
|
|
*
|
|
* The contents of this file are subject to the terms of the
|
|
* Common Development and Distribution License, Version 1.0 only
|
|
* (the "License"). You may not use this file except in compliance
|
|
* with the License.
|
|
*
|
|
* You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
|
|
* or http://www.opensolaris.org/os/licensing.
|
|
* See the License for the specific language governing permissions
|
|
* and limitations under the License.
|
|
*
|
|
* When distributing Covered Code, include this CDDL HEADER in each
|
|
* file and include the License file at usr/src/OPENSOLARIS.LICENSE.
|
|
* If applicable, add the following below this CDDL HEADER, with the
|
|
* fields enclosed by brackets "[]" replaced with your own identifying
|
|
* information: Portions Copyright [yyyy] [name of copyright owner]
|
|
*
|
|
* CDDL HEADER END
|
|
*/
|
|
/*
|
|
* Copyright 2005 Sun Microsystems, Inc. All rights reserved.
|
|
* Copyright 2006 Ricardo Correia. All rights reserved.
|
|
* Use is subject to license terms.
|
|
*/
|
|
|
|
/* Copyright (c) 1988 AT&T */
|
|
/* All Rights Reserved */
|
|
|
|
#include <stdio.h>
|
|
#include <string.h>
|
|
#include <mntent.h>
|
|
#include <sys/mnttab.h>
|
|
|
|
#include <sys/types.h>
|
|
#include <sys/stat.h>
|
|
#include <unistd.h>
|
|
|
|
#define BUFSIZE (MNT_LINE_MAX + 2)
|
|
|
|
__thread char buf[BUFSIZE];
|
|
|
|
#define DIFF(xx) ( \
|
|
(mrefp->xx != NULL) && \
|
|
(mgetp->xx == NULL || strcmp(mrefp->xx, mgetp->xx) != 0))
|
|
|
|
int
|
|
getmntany(FILE *fp, struct mnttab *mgetp, struct mnttab *mrefp)
|
|
{
|
|
int ret;
|
|
|
|
while (
|
|
((ret = _sol_getmntent(fp, mgetp)) == 0) && (
|
|
DIFF(mnt_special) || DIFF(mnt_mountp) ||
|
|
DIFF(mnt_fstype) || DIFF(mnt_mntopts))) { }
|
|
|
|
return (ret);
|
|
}
|
|
|
|
int
|
|
_sol_getmntent(FILE *fp, struct mnttab *mgetp)
|
|
{
|
|
struct mntent mntbuf;
|
|
struct mntent *ret;
|
|
|
|
ret = getmntent_r(fp, &mntbuf, buf, BUFSIZE);
|
|
|
|
if (ret != NULL) {
|
|
mgetp->mnt_special = mntbuf.mnt_fsname;
|
|
mgetp->mnt_mountp = mntbuf.mnt_dir;
|
|
mgetp->mnt_fstype = mntbuf.mnt_type;
|
|
mgetp->mnt_mntopts = mntbuf.mnt_opts;
|
|
return (0);
|
|
}
|
|
|
|
if (feof(fp))
|
|
return (-1);
|
|
|
|
return (MNT_TOOLONG);
|
|
}
|
|
|
|
int
|
|
getextmntent(FILE *fp, struct extmnttab *mp, int len)
|
|
{
|
|
int ret;
|
|
struct stat64 st;
|
|
|
|
ret = _sol_getmntent(fp, (struct mnttab *)mp);
|
|
if (ret == 0) {
|
|
if (stat64(mp->mnt_mountp, &st) != 0) {
|
|
mp->mnt_major = 0;
|
|
mp->mnt_minor = 0;
|
|
return (ret);
|
|
}
|
|
mp->mnt_major = major(st.st_dev);
|
|
mp->mnt_minor = minor(st.st_dev);
|
|
}
|
|
|
|
return (ret);
|
|
}
|