1 files changed, 153 insertions, 180 deletions

diff --git a/xlators/nfs/server/src/nfs-generics.c b/xlators/nfs/server/src/nfs-generics.c
index 7e10ea8978c..feadb4cfb3f 100644
--- a/xlators/nfs/server/src/nfs-generics.c
+++ b/xlators/nfs/server/src/nfs-generics.c
@@ -8,7 +8,6 @@
   cases as published by the Free Software Foundation.
 */
 
-
 #include "string.h"
 
 #include "nfs.h"
@@ -17,323 +16,297 @@
 #include "nfs-generics.h"
 #include "xlator.h"
 
-
 int
-nfs_fstat (xlator_t *nfsx, xlator_t *xl, nfs_user_t *nfu, fd_t *fd,
-           fop_stat_cbk_t cbk, void *local)
+nfs_fstat(xlator_t *nfsx, xlator_t *xl, nfs_user_t *nfu, fd_t *fd,
+          fop_stat_cbk_t cbk, void *local)
 {
-        int             ret = -EFAULT;
-
-        if ((!nfsx) || (!xl) || (!fd) || (!nfu))
-                return ret;
+    int ret = -EFAULT;
 
-        ret = nfs_fop_fstat (nfsx, xl, nfu, fd, cbk, local);
+    if ((!nfsx) || (!xl) || (!fd) || (!nfu))
         return ret;
+
+    ret = nfs_fop_fstat(nfsx, xl, nfu, fd, cbk, local);
+    return ret;
 }
 
 int
-nfs_access (xlator_t *nfsx, xlator_t *xl, nfs_user_t *nfu, loc_t *pathloc,
-            int32_t accesstest, fop_access_cbk_t cbk, void *local)
+nfs_access(xlator_t *nfsx, xlator_t *xl, nfs_user_t *nfu, loc_t *pathloc,
+           int32_t accesstest, fop_access_cbk_t cbk, void *local)
 {
-        int             ret = -EFAULT;
+    int ret = -EFAULT;
 
-        if ((!nfsx) || (!xl) || (!pathloc) || (!nfu))
-                return ret;
+    if ((!nfsx) || (!xl) || (!pathloc) || (!nfu))
+        return ret;
 
-        ret = nfs_fop_access (nfsx, xl, nfu, pathloc, accesstest, cbk, local);
+    ret = nfs_fop_access(nfsx, xl, nfu, pathloc, accesstest, cbk, local);
 
-        return ret;
+    return ret;
 }
 
 int
-nfs_stat (xlator_t *nfsx, xlator_t *xl, nfs_user_t *nfu, loc_t *pathloc,
-          fop_stat_cbk_t cbk, void *local)
+nfs_stat(xlator_t *nfsx, xlator_t *xl, nfs_user_t *nfu, loc_t *pathloc,
+         fop_stat_cbk_t cbk, void *local)
 {
-        int             ret = -EFAULT;
+    int ret = -EFAULT;
 
-        if ((!nfsx) || (!xl) || (!pathloc) || (!nfu))
-                return ret;
+    if ((!nfsx) || (!xl) || (!pathloc) || (!nfu))
+        return ret;
 
-        ret = nfs_fop_stat (nfsx, xl, nfu, pathloc, cbk, local);
+    ret = nfs_fop_stat(nfsx, xl, nfu, pathloc, cbk, local);
 
-        return ret;
+    return ret;
 }
 
-
 int
-nfs_readdirp (xlator_t *nfsx, xlator_t *xl, nfs_user_t *nfu, fd_t *dirfd,
-              size_t bufsize, off_t offset, fop_readdir_cbk_t cbk, void *local)
+nfs_readdirp(xlator_t *nfsx, xlator_t *xl, nfs_user_t *nfu, fd_t *dirfd,
+             size_t bufsize, off_t offset, fop_readdir_cbk_t cbk, void *local)
 {
-        if ((!nfsx) || (!xl) || (!dirfd) || (!nfu))
-                return -EFAULT;
+    if ((!nfsx) || (!xl) || (!dirfd) || (!nfu))
+        return -EFAULT;
 
-        return nfs_fop_readdirp (nfsx, xl, nfu, dirfd, bufsize, offset, cbk,
-                                 local);
+    return nfs_fop_readdirp(nfsx, xl, nfu, dirfd, bufsize, offset, cbk, local);
 }
 
-
 int
-nfs_lookup (xlator_t *nfsx, xlator_t *xl, nfs_user_t *nfu, loc_t *pathloc,
-            fop_lookup_cbk_t cbk, void *local)
+nfs_lookup(xlator_t *nfsx, xlator_t *xl, nfs_user_t *nfu, loc_t *pathloc,
+           fop_lookup_cbk_t cbk, void *local)
 {
-        int             ret = -EFAULT;
+    int ret = -EFAULT;
 
-        if ((!nfsx) || (!xl) || (!pathloc) || (!nfu))
-                return ret;
-
-        ret = nfs_fop_lookup (nfsx, xl, nfu, pathloc, cbk, local);
+    if ((!nfsx) || (!xl) || (!pathloc) || (!nfu))
         return ret;
+
+    ret = nfs_fop_lookup(nfsx, xl, nfu, pathloc, cbk, local);
+    return ret;
 }
 
 int
-nfs_create (xlator_t *nfsx, xlator_t *xl, nfs_user_t *nfu, loc_t *pathloc,
-            int flags, mode_t mode, fop_create_cbk_t cbk, void *local)
+nfs_create(xlator_t *nfsx, xlator_t *xl, nfs_user_t *nfu, loc_t *pathloc,
+           int flags, mode_t mode, fop_create_cbk_t cbk, void *local)
 {
-        int                     ret = -EFAULT;
-
-        if ((!nfsx) || (!xl) || (!pathloc) || (!nfu))
-                return ret;
+    int ret = -EFAULT;
 
-        ret = nfs_inode_create (nfsx, xl, nfu, pathloc, flags, mode, cbk,local);
+    if ((!nfsx) || (!xl) || (!pathloc) || (!nfu))
         return ret;
-}
 
+    ret = nfs_inode_create(nfsx, xl, nfu, pathloc, flags, mode, cbk, local);
+    return ret;
+}
 
 int
-nfs_flush (xlator_t *nfsx, xlator_t *xl, nfs_user_t *nfu, fd_t *fd,
-           fop_flush_cbk_t cbk, void *local)
+nfs_flush(xlator_t *nfsx, xlator_t *xl, nfs_user_t *nfu, fd_t *fd,
+          fop_flush_cbk_t cbk, void *local)
 {
-        return nfs_fop_flush (nfsx, xl, nfu, fd, cbk, local);
+    return nfs_fop_flush(nfsx, xl, nfu, fd, cbk, local);
 }
 
-
-
 int
-nfs_mkdir (xlator_t *nfsx, xlator_t *xl, nfs_user_t *nfu, loc_t *pathloc,
-           mode_t mode, fop_mkdir_cbk_t cbk, void *local)
+nfs_mkdir(xlator_t *nfsx, xlator_t *xl, nfs_user_t *nfu, loc_t *pathloc,
+          mode_t mode, fop_mkdir_cbk_t cbk, void *local)
 {
-        int                     ret = -EFAULT;
+    int ret = -EFAULT;
 
-        if ((!nfsx) || (!xl) || (!pathloc) || (!nfu))
-                return ret;
-
-        ret = nfs_inode_mkdir (nfsx, xl, nfu, pathloc, mode, cbk, local);
+    if ((!nfsx) || (!xl) || (!pathloc) || (!nfu))
         return ret;
-}
-
 
+    ret = nfs_inode_mkdir(nfsx, xl, nfu, pathloc, mode, cbk, local);
+    return ret;
+}
 
 int
-nfs_truncate (xlator_t *nfsx, xlator_t *xl, nfs_user_t *nfu, loc_t *pathloc,
-              off_t offset, fop_truncate_cbk_t cbk, void *local)
+nfs_truncate(xlator_t *nfsx, xlator_t *xl, nfs_user_t *nfu, loc_t *pathloc,
+             off_t offset, fop_truncate_cbk_t cbk, void *local)
 {
-        int     ret = -EFAULT;
+    int ret = -EFAULT;
 
-        if ((!xl) || (!pathloc) || (!nfu))
-                return ret;
-
-        ret = nfs_fop_truncate (nfsx, xl, nfu, pathloc, offset, cbk, local);
+    if ((!xl) || (!pathloc) || (!nfu))
         return ret;
+
+    ret = nfs_fop_truncate(nfsx, xl, nfu, pathloc, offset, cbk, local);
+    return ret;
 }
 
 int
-nfs_read (xlator_t *nfsx, xlator_t *xl, nfs_user_t *nfu, fd_t *fd, size_t size,
-          off_t offset, fop_readv_cbk_t cbk, void *local)
+nfs_read(xlator_t *nfsx, xlator_t *xl, nfs_user_t *nfu, fd_t *fd, size_t size,
+         off_t offset, fop_readv_cbk_t cbk, void *local)
 {
-        return nfs_fop_read (nfsx, xl, nfu, fd, size, offset, cbk, local);
+    return nfs_fop_read(nfsx, xl, nfu, fd, size, offset, cbk, local);
 }
 
 int
-nfs_lk (xlator_t *nfsx, xlator_t *xl, nfs_user_t *nfu, fd_t *fd,
-        int cmd, struct gf_flock *flock, fop_lk_cbk_t cbk, void *local)
+nfs_lk(xlator_t *nfsx, xlator_t *xl, nfs_user_t *nfu, fd_t *fd, int cmd,
+       struct gf_flock *flock, fop_lk_cbk_t cbk, void *local)
 {
-        return nfs_fop_lk ( nfsx, xl, nfu, fd, cmd, flock, cbk, local);
+    return nfs_fop_lk(nfsx, xl, nfu, fd, cmd, flock, cbk, local);
 }
 
 int
-nfs_getxattr (xlator_t *nfsx, xlator_t *xl, nfs_user_t *nfu, loc_t *loc,
-              char *name, dict_t *xdata, fop_getxattr_cbk_t cbk, void *local)
+nfs_getxattr(xlator_t *nfsx, xlator_t *xl, nfs_user_t *nfu, loc_t *loc,
+             char *name, dict_t *xdata, fop_getxattr_cbk_t cbk, void *local)
 {
-        return nfs_fop_getxattr (nfsx, xl, nfu, loc, name, xdata, cbk, local);
+    return nfs_fop_getxattr(nfsx, xl, nfu, loc, name, xdata, cbk, local);
 }
 
 int
-nfs_setxattr (xlator_t *nfsx, xlator_t *xl, nfs_user_t *nfu,
-              loc_t *loc, dict_t *dict, int32_t flags, dict_t *xdata,
-              fop_setxattr_cbk_t cbk, void *local)
+nfs_setxattr(xlator_t *nfsx, xlator_t *xl, nfs_user_t *nfu, loc_t *loc,
+             dict_t *dict, int32_t flags, dict_t *xdata, fop_setxattr_cbk_t cbk,
+             void *local)
 {
-        return nfs_fop_setxattr (nfsx, xl, nfu, loc, dict, flags, xdata, cbk,
-                                local);
+    return nfs_fop_setxattr(nfsx, xl, nfu, loc, dict, flags, xdata, cbk, local);
 }
 
 int
-nfs_fsync (xlator_t *nfsx, xlator_t *xl, nfs_user_t *nfu, fd_t *fd,
-           int32_t datasync, fop_fsync_cbk_t cbk, void *local)
+nfs_fsync(xlator_t *nfsx, xlator_t *xl, nfs_user_t *nfu, fd_t *fd,
+          int32_t datasync, fop_fsync_cbk_t cbk, void *local)
 {
-        return nfs_fop_fsync (nfsx, xl, nfu, fd, datasync, cbk, local);
+    return nfs_fop_fsync(nfsx, xl, nfu, fd, datasync, cbk, local);
 }
 
-
 int
-nfs_write (xlator_t *nfsx, xlator_t *xl, nfs_user_t *nfu, fd_t *fd,
-           struct iobref *srciobref, struct iovec *vector, int32_t count,
-           off_t offset, fop_writev_cbk_t cbk, void *local)
+nfs_write(xlator_t *nfsx, xlator_t *xl, nfs_user_t *nfu, fd_t *fd,
+          struct iobref *srciobref, struct iovec *vector, int32_t count,
+          off_t offset, fop_writev_cbk_t cbk, void *local)
 {
-        return nfs_fop_write (nfsx, xl, nfu, fd, srciobref, vector, count,
-                              offset, cbk, local);
+    return nfs_fop_write(nfsx, xl, nfu, fd, srciobref, vector, count, offset,
+                         cbk, local);
 }
 
-
 int
-nfs_open (xlator_t *nfsx, xlator_t *xl, nfs_user_t *nfu, loc_t *pathloc,
-          int32_t flags, fop_open_cbk_t cbk, void *local)
+nfs_open(xlator_t *nfsx, xlator_t *xl, nfs_user_t *nfu, loc_t *pathloc,
+         int32_t flags, fop_open_cbk_t cbk, void *local)
 {
-        int             ret = -EFAULT;
-
-        if ((!nfsx) || (!xl) || (!pathloc) || (!nfu))
-                return ret;
+    int ret = -EFAULT;
 
-        ret = nfs_inode_open (nfsx, xl, nfu, pathloc, flags, cbk,
-                              local);
+    if ((!nfsx) || (!xl) || (!pathloc) || (!nfu))
         return ret;
-}
 
+    ret = nfs_inode_open(nfsx, xl, nfu, pathloc, flags, cbk, local);
+    return ret;
+}
 
 int
-nfs_rename (xlator_t *nfsx, xlator_t *xl, nfs_user_t *nfu, loc_t *oldloc,
-            loc_t *newloc, fop_rename_cbk_t cbk, void *local)
+nfs_rename(xlator_t *nfsx, xlator_t *xl, nfs_user_t *nfu, loc_t *oldloc,
+           loc_t *newloc, fop_rename_cbk_t cbk, void *local)
 {
-        int                     ret = -EFAULT;
-
-        if ((!nfsx) || (!xl) || (!oldloc) || (!newloc) || (!nfu))
-                return ret;
+    int ret = -EFAULT;
 
-        ret = nfs_inode_rename (nfsx, xl, nfu, oldloc, newloc, cbk, local);
+    if ((!nfsx) || (!xl) || (!oldloc) || (!newloc) || (!nfu))
         return ret;
-}
 
+    ret = nfs_inode_rename(nfsx, xl, nfu, oldloc, newloc, cbk, local);
+    return ret;
+}
 
 int
-nfs_link (xlator_t *nfsx, xlator_t *xl, nfs_user_t *nfu, loc_t *oldloc,
-          loc_t *newloc, fop_link_cbk_t cbk, void *local)
+nfs_link(xlator_t *nfsx, xlator_t *xl, nfs_user_t *nfu, loc_t *oldloc,
+         loc_t *newloc, fop_link_cbk_t cbk, void *local)
 {
-        int                     ret = -EFAULT;
+    int ret = -EFAULT;
 
-        if ((!nfsx) || (!xl) || (!oldloc) || (!newloc) || (!nfu))
-                return ret;
-
-        ret = nfs_inode_link (nfsx, xl, nfu, oldloc, newloc, cbk, local);
+    if ((!nfsx) || (!xl) || (!oldloc) || (!newloc) || (!nfu))
         return ret;
-}
 
+    ret = nfs_inode_link(nfsx, xl, nfu, oldloc, newloc, cbk, local);
+    return ret;
+}
 
 int
-nfs_unlink (xlator_t *nfsx, xlator_t *xl, nfs_user_t *nfu, loc_t *pathloc,
-            fop_unlink_cbk_t cbk, void *local)
+nfs_unlink(xlator_t *nfsx, xlator_t *xl, nfs_user_t *nfu, loc_t *pathloc,
+           fop_unlink_cbk_t cbk, void *local)
 {
-        int                     ret = -EFAULT;
-
-        if ((!xl) || (!pathloc) || (!nfu))
-                return ret;
+    int ret = -EFAULT;
 
-        ret = nfs_inode_unlink (nfsx, xl, nfu, pathloc, cbk, local);
+    if ((!xl) || (!pathloc) || (!nfu))
         return ret;
-}
 
+    ret = nfs_inode_unlink(nfsx, xl, nfu, pathloc, cbk, local);
+    return ret;
+}
 
 int
-nfs_rmdir (xlator_t *nfsx, xlator_t *xl, nfs_user_t *nfu, loc_t *path,
-           fop_rmdir_cbk_t cbk, void *local)
+nfs_rmdir(xlator_t *nfsx, xlator_t *xl, nfs_user_t *nfu, loc_t *path,
+          fop_rmdir_cbk_t cbk, void *local)
 {
-        int                     ret = -EFAULT;
+    int ret = -EFAULT;
 
-        if ((!nfsx) || (!xl) || (!path) || (!nfu))
-                return ret;
-
-        ret = nfs_inode_rmdir (nfsx, xl, nfu, path, cbk, local);
+    if ((!nfsx) || (!xl) || (!path) || (!nfu))
         return ret;
-}
 
+    ret = nfs_inode_rmdir(nfsx, xl, nfu, path, cbk, local);
+    return ret;
+}
 
 int
-nfs_mknod (xlator_t *nfsx, xlator_t *xl, nfs_user_t *nfu, loc_t *pathloc,
-           mode_t mode, dev_t dev, fop_mknod_cbk_t cbk, void *local)
+nfs_mknod(xlator_t *nfsx, xlator_t *xl, nfs_user_t *nfu, loc_t *pathloc,
+          mode_t mode, dev_t dev, fop_mknod_cbk_t cbk, void *local)
 {
-        int                     ret = -EFAULT;
-
-        if ((!nfsx) || (!xl) || (!pathloc) || (!nfu))
-                return ret;
+    int ret = -EFAULT;
 
-        ret = nfs_inode_mknod (nfsx, xl, nfu, pathloc, mode, dev, cbk, local);
+    if ((!nfsx) || (!xl) || (!pathloc) || (!nfu))
         return ret;
-}
 
+    ret = nfs_inode_mknod(nfsx, xl, nfu, pathloc, mode, dev, cbk, local);
+    return ret;
+}
 
 int
-nfs_readlink (xlator_t *nfsx, xlator_t *xl, nfs_user_t *nfu, loc_t *linkloc,
-              fop_readlink_cbk_t cbk, void *local)
+nfs_readlink(xlator_t *nfsx, xlator_t *xl, nfs_user_t *nfu, loc_t *linkloc,
+             fop_readlink_cbk_t cbk, void *local)
 {
-        int                     ret = -EFAULT;
-
-        if ((!nfsx) || (!xl) || (!linkloc) || (!nfu))
-                return ret;
+    int ret = -EFAULT;
 
-        ret = nfs_fop_readlink (nfsx, xl, nfu, linkloc, NFS_PATH_MAX, cbk,
-                                local);
+    if ((!nfsx) || (!xl) || (!linkloc) || (!nfu))
         return ret;
-}
 
+    ret = nfs_fop_readlink(nfsx, xl, nfu, linkloc, NFS_PATH_MAX, cbk, local);
+    return ret;
+}
 
 int
-nfs_symlink (xlator_t *nfsx, xlator_t *xl, nfs_user_t *nfu, char *target,
-             loc_t *linkloc, fop_symlink_cbk_t cbk, void *local)
+nfs_symlink(xlator_t *nfsx, xlator_t *xl, nfs_user_t *nfu, char *target,
+            loc_t *linkloc, fop_symlink_cbk_t cbk, void *local)
 {
-        int                     ret = -EFAULT;
+    int ret = -EFAULT;
 
-        if ((!nfsx) || (!xl) || (!linkloc) || (!target) || (!nfu))
-                return ret;
-
-        ret = nfs_inode_symlink (nfsx, xl, nfu, target, linkloc, cbk, local);
+    if ((!nfsx) || (!xl) || (!linkloc) || (!target) || (!nfu))
         return ret;
-}
-
 
+    ret = nfs_inode_symlink(nfsx, xl, nfu, target, linkloc, cbk, local);
+    return ret;
+}
 
 int
-nfs_setattr (xlator_t *nfsx, xlator_t *xl, nfs_user_t *nfu, loc_t *pathloc,
-             struct iatt *buf, int32_t valid, fop_setattr_cbk_t cbk,
-             void *local)
+nfs_setattr(xlator_t *nfsx, xlator_t *xl, nfs_user_t *nfu, loc_t *pathloc,
+            struct iatt *buf, int32_t valid, fop_setattr_cbk_t cbk, void *local)
 {
-        int     ret = -EFAULT;
-
-        if ((!nfsx) || (!xl) || (!pathloc) || (!nfu))
-                return ret;
+    int ret = -EFAULT;
 
-        ret = nfs_fop_setattr (nfsx, xl, nfu, pathloc, buf, valid, cbk, local);
+    if ((!nfsx) || (!xl) || (!pathloc) || (!nfu))
         return ret;
-}
 
+    ret = nfs_fop_setattr(nfsx, xl, nfu, pathloc, buf, valid, cbk, local);
+    return ret;
+}
 
 int
-nfs_statfs (xlator_t *nfsx, xlator_t *xl, nfs_user_t *nfu, loc_t *pathloc,
-            fop_statfs_cbk_t cbk, void *local)
+nfs_statfs(xlator_t *nfsx, xlator_t *xl, nfs_user_t *nfu, loc_t *pathloc,
+           fop_statfs_cbk_t cbk, void *local)
 {
-        int     ret = -EFAULT;
+    int ret = -EFAULT;
 
-        if ((!nfsx) || (!xl) || (!pathloc) || (!nfu))
-                return ret;
-
-        ret = nfs_fop_statfs (nfsx, xl, nfu, pathloc, cbk, local);
+    if ((!nfsx) || (!xl) || (!pathloc) || (!nfu))
         return ret;
+
+    ret = nfs_fop_statfs(nfsx, xl, nfu, pathloc, cbk, local);
+    return ret;
 }
 
 int
-nfs_opendir (xlator_t *nfsx, xlator_t *fopxl, nfs_user_t *nfu, loc_t *pathloc,
-             fop_opendir_cbk_t cbk, void *local)
+nfs_opendir(xlator_t *nfsx, xlator_t *fopxl, nfs_user_t *nfu, loc_t *pathloc,
+            fop_opendir_cbk_t cbk, void *local)
 {
-        if ((!nfsx) || (!fopxl) || (!pathloc) || (!nfu))
-                return -EFAULT;
+    if ((!nfsx) || (!fopxl) || (!pathloc) || (!nfu))
+        return -EFAULT;
 
-        return nfs_inode_opendir (nfsx, fopxl, nfu, pathloc, cbk, local);
+    return nfs_inode_opendir(nfsx, fopxl, nfu, pathloc, cbk, local);
 }
-