aboutsummaryrefslogtreecommitdiffstats
path: root/lib/libzfs/libzfs_mount.c
diff options
context:
space:
mode:
authorMichael Kjorling <[email protected]>2013-11-01 20:26:11 +0100
committerBrian Behlendorf <[email protected]>2013-12-18 16:46:35 -0800
commitd1d7e2689db9e03f11c069ebc9f1ba12829e5dac (patch)
tree75b9a2b23334d5f673fb31f142f74146d351865c /lib/libzfs/libzfs_mount.c
parent8ffef572ed2ba97e0c2d6a8aa2240012e611dc6f (diff)
cstyle: Resolve C style issues
The vast majority of these changes are in Linux specific code. They are the result of not having an automated style checker to validate the code when it was originally written. Others were caused when the common code was slightly adjusted for Linux. This patch contains no functional changes. It only refreshes the code to conform to style guide. Everyone submitting patches for inclusion upstream should now run 'make checkstyle' and resolve any warning prior to opening a pull request. The automated builders have been updated to fail a build if when 'make checkstyle' detects an issue. Signed-off-by: Brian Behlendorf <[email protected]> Closes #1821
Diffstat (limited to 'lib/libzfs/libzfs_mount.c')
-rw-r--r--lib/libzfs/libzfs_mount.c20
1 files changed, 10 insertions, 10 deletions
diff --git a/lib/libzfs/libzfs_mount.c b/lib/libzfs/libzfs_mount.c
index 68e4ef4de..3cd6406b2 100644
--- a/lib/libzfs/libzfs_mount.c
+++ b/lib/libzfs/libzfs_mount.c
@@ -279,7 +279,7 @@ do_mount(const char *src, const char *mntpt, char *opts)
"-t", MNTTYPE_ZFS,
"-o", opts,
(char *)src,
- (char *)mntpt,
+ (char *)mntpt,
(char *)NULL };
int rc;
@@ -287,22 +287,22 @@ do_mount(const char *src, const char *mntpt, char *opts)
rc = libzfs_run_process(argv[0], argv, STDOUT_VERBOSE|STDERR_VERBOSE);
if (rc) {
if (rc & MOUNT_FILEIO)
- return EIO;
+ return (EIO);
if (rc & MOUNT_USER)
- return EINTR;
+ return (EINTR);
if (rc & MOUNT_SOFTWARE)
- return EPIPE;
+ return (EPIPE);
if (rc & MOUNT_BUSY)
- return EBUSY;
+ return (EBUSY);
if (rc & MOUNT_SYSERR)
- return EAGAIN;
+ return (EAGAIN);
if (rc & MOUNT_USAGE)
- return EINVAL;
+ return (EINVAL);
- return ENXIO; /* Generic error */
+ return (ENXIO); /* Generic error */
}
- return 0;
+ return (0);
}
static int
@@ -890,7 +890,7 @@ zfs_unshare_proto(zfs_handle_t *zhp, const char *mountpoint,
mntpt = zfs_strdup(zhp->zfs_hdl, entry.mnt_mountp);
for (curr_proto = proto; *curr_proto != PROTO_END;
- curr_proto++) {
+ curr_proto++) {
if (is_shared(hdl, mntpt, *curr_proto) &&
unshare_one(hdl, zhp->zfs_name,