nfs: Redesign fop argument passing to support single volfile use

The current design of the interaction between the generic NFS layer and the
protocol handlers like mount3 and nfs3 is such that it does not allow using a
single volume file which contains the nfs/server and the protocol/server.
This is because the common nfs-fops layer assumes that ctx->top is always the
nfs/server. This is wrong. The fops layer needs access to top because top or
rather the generic NFS xlator's private state has a mem-pool. The fops layer
needs this mem-pool to get memory for storing per-fop state. Since the fops
layer cannot anymore take ctx->top be the nfs/server, all layers need to start
passing the nfs/server xlator_t right down to the fops layer.

I am also taking this chance to remove the synchronous equivalents of the fops
and also remove the dirent caching directory operations.

Signed-off-by: Shehjar Tikoo <shehjart@gluster.com>
Signed-off-by: Anand V. Avati <avati@dev.gluster.com>

BUG: 770 (NFS Xlator - Crash when both GlusterFS server/NFS Server are in the same file)
URL: http://bugs.gluster.com/cgi-bin/bugzilla3/show_bug.cgi?id=770

1 files changed, 37 insertions, 51 deletions

diff --git a/xlators/nfs/server/src/nfs-generics.h b/xlators/nfs/server/src/nfs-generics.h
index 980e73020d4..55740f7b2f4 100644
--- a/xlators/nfs/server/src/nfs-generics.h
+++ b/xlators/nfs/server/src/nfs-generics.h
@@ -54,91 +54,91 @@ typedef struct nfs_fop_fdcontext {
 } nfs_fdctx_t;
 
 extern int
-nfs_fstat (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);
 
 extern int
-nfs_readdirp (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);
 
 
 extern int
-nfs_lookup (xlator_t *xl, nfs_user_t *nfu, loc_t *pathloc,
+nfs_lookup (xlator_t *nfsx, xlator_t *xl, nfs_user_t *nfu, loc_t *pathloc,
             fop_lookup_cbk_t cbk, void *local);
 
 extern int
-nfs_create (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);
 
 extern int
-nfs_flush (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);
 
 extern int
-nfs_mkdir (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);
 
 extern int
-nfs_truncate (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);
 
 extern int
-nfs_read (xlator_t *xl, nfs_user_t *nfu, fd_t *fd, size_t size,
+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);
 
 extern int
-nfs_fsync (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);
 
 extern int
-nfs_write (xlator_t *xl, nfs_user_t *nfu, fd_t *fd, struct iobuf *srciob,
-           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 iobuf *srciob, struct iovec *vector, int32_t count,
+           off_t offset, fop_writev_cbk_t cbk, void *local);
 
 extern int
-nfs_open (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);
 
 extern int
-nfs_rename (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);
 
 extern int
-nfs_link (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);
 
 extern int
-nfs_unlink (xlator_t *xl, nfs_user_t *nfu, loc_t *pathloc,
+nfs_unlink (xlator_t *nfsx, xlator_t *xl, nfs_user_t *nfu, loc_t *pathloc,
             fop_unlink_cbk_t cbk, void *local);
 
 extern int
-nfs_rmdir (xlator_t *xl, nfs_user_t *nfu, loc_t *pathloc,
+nfs_rmdir (xlator_t *nfsx, xlator_t *xl, nfs_user_t *nfu, loc_t *pathloc,
            fop_rmdir_cbk_t cbk, void *local);
 
 extern int
-nfs_mknod (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);
 
 extern int
-nfs_readlink (xlator_t *xl, nfs_user_t *nfu, loc_t *linkloc,
+nfs_readlink (xlator_t *nfsx, xlator_t *xl, nfs_user_t *nfu, loc_t *linkloc,
               fop_readlink_cbk_t cbk, void *local);
 
 extern int
-nfs_setattr (xlator_t *xl, nfs_user_t *nfu, loc_t *pathloc,
+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);
 
 extern int
-nfs_statfs (xlator_t *xl, nfs_user_t *nfu, loc_t *pathloc,
+nfs_statfs (xlator_t *nfsx, xlator_t *xl, nfs_user_t *nfu, loc_t *pathloc,
             fop_statfs_cbk_t cbk, void *local);
 
 extern int
-nfs_stat (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);
 
 extern int
-nfs_symlink (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);
 
 /* Synchronous equivalents */
 
@@ -146,29 +146,15 @@ extern call_stub_t *
 nfs_open_sync (xlator_t *xl, nfs_user_t *nfu, loc_t *pathloc,
                int32_t flags);
 
-extern int
-nfs_readdir_sync (xlator_t *nfsx, xlator_t *fopxl, nfs_user_t *nfu,
-                  fd_t *dirfd, gf_dirent_t *entry);
-
-extern call_stub_t *
-nfs_flush_sync (xlator_t *xl, nfs_user_t *nfu, fd_t *fd);
-
 extern call_stub_t *
 nfs_write_sync (xlator_t *xl, nfs_user_t *nfu, fd_t *fd, struct iobuf *srciob,
                 struct iovec *vec, int count, off_t offset);
 
 extern call_stub_t *
-nfs_fsync_sync (xlator_t *xl, nfs_user_t *nfu, fd_t *fd, int32_t datasync);
-
-extern call_stub_t *
 nfs_read_sync (xlator_t *xl, nfs_user_t *nfu, fd_t *fd, size_t size,
                off_t offset);
 
-extern call_stub_t *
-nfs_opendir_sync (xlator_t *nfsx, xlator_t *fopxl, nfs_user_t *nfu,
-                  loc_t *dirloc, size_t bufsize);
-
 extern int
-nfs_opendir (xlator_t *fopxl, nfs_user_t *nfu, loc_t *pathloc,
+nfs_opendir (xlator_t *nfsx, xlator_t *fopxl, nfs_user_t *nfu, loc_t *pathloc,
              fop_opendir_cbk_t cbk, void *local);
 #endif