diff options
| author | George Melikov <[email protected]> | 2017-01-12 20:42:11 +0300 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2017-01-12 09:42:11 -0800 |
| commit | e9aa730c49b91694b146e0cd28192f1aaf843d0e (patch) | |
| tree | 3ee2eaf10960ad98e5f5feaee05074db0f2876d5 /lib | |
| parent | 42b64e50c093a4ad499458a6258254e399a4de52 (diff) | |
OpenZFS 6328 - Fix cstyle errors in zfs codebase
Authored by: Paul Dagnelie <[email protected]>
Reviewed by: Matthew Ahrens <[email protected]>
Reviewed by: Alex Reece <[email protected]>
Reviewed by: Richard Elling <[email protected]>
Reviewed by: Jorgen Lundman <[email protected]>
Approved by: Robert Mustacchi <[email protected]>
Reviewed-by: Brian Behlendorf <[email protected]>
Ported-by: George Melikov <[email protected]>
OpenZFS-issue: https://www.illumos.org/issues/6328
OpenZFS-commit: https://github.com/illumos/illumos-gate/commit/9a686fb
Closes #5579
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/libzfs/libzfs_iter.c | 5 | ||||
| -rw-r--r-- | lib/libzpool/kernel.c | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/lib/libzfs/libzfs_iter.c b/lib/libzfs/libzfs_iter.c index c656db6fc..e22a2c85b 100644 --- a/lib/libzfs/libzfs_iter.c +++ b/lib/libzfs/libzfs_iter.c @@ -21,7 +21,7 @@ /* * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. - * Copyright (c) 2013 by Delphix. All rights reserved. + * Copyright (c) 2013, 2015 by Delphix. All rights reserved. * Copyright 2014 Nexenta Systems, Inc. All rights reserved. */ @@ -309,7 +309,8 @@ typedef struct { } snapspec_arg_t; static int -snapspec_cb(zfs_handle_t *zhp, void *arg) { +snapspec_cb(zfs_handle_t *zhp, void *arg) +{ snapspec_arg_t *ssa = arg; char *shortsnapname; int err = 0; diff --git a/lib/libzpool/kernel.c b/lib/libzpool/kernel.c index bda9d01fe..b0418cb09 100644 --- a/lib/libzpool/kernel.c +++ b/lib/libzpool/kernel.c @@ -737,7 +737,7 @@ vn_openat(char *path, int x1, int flags, int mode, vnode_t **vpp, int x2, /*ARGSUSED*/ int vn_rdwr(int uio, vnode_t *vp, void *addr, ssize_t len, offset_t offset, - int x1, int x2, rlim64_t x3, void *x4, ssize_t *residp) + int x1, int x2, rlim64_t x3, void *x4, ssize_t *residp) { ssize_t rc, done = 0, split; |