diff options
| author | Shehjar Tikoo <shehjart@gluster.com> | 2010-10-07 05:23:59 +0000 |
|---|---|---|
| committer | Vijay Bellur <vijay@dev.gluster.com> | 2010-10-07 05:08:59 -0700 |
| commit | 58ce5f46af7e08db3d786c597ec5144294fbd099 (patch) | |
| tree | fb35da951e6678e17cd26753c988ed98773405f2 /xlators/nfs/server/src/nfs.h | |
| parent | 32b62dd42fc479d19211a3c223b665d28d2207f2 (diff) | |
nfs: Revert downed-subvolume changes
For the record these are the patches committed as:
1. "nfs, nfs3: Base volume access on CHILD-UP-DOWN event"
http://git.gluster.com/?p=glusterfs.git;a=commit;h=f47b0c55de9941823fbefe4b3a7e37179d6d4329
2. "nfs: Fix multiple subvolume CHILD-UP support"
http://git.gluster.com/?p=glusterfs.git;a=commit;h=336e2df7b74be7ad4c9ed403ca10b9f7f7ef9a58
3. "nfs,nfs3: Disable subvolume on ENOTCONN"
http://git.gluster.com/?p=glusterfs.git;a=commit;h=8c6e27cdaf895e3031c3256efb9472a6c0bf61f3
Signed-off-by: Shehjar Tikoo <shehjart@gluster.com>
Signed-off-by: Vijay Bellur <vijay@dev.gluster.com>
BUG: 1724 (kernel untar fails during add-brick)
URL: http://bugs.gluster.com/cgi-bin/bugzilla3/show_bug.cgi?id=1724
Diffstat (limited to 'xlators/nfs/server/src/nfs.h')
| -rw-r--r-- | xlators/nfs/server/src/nfs.h | 21 |
1 files changed, 2 insertions, 19 deletions
diff --git a/xlators/nfs/server/src/nfs.h b/xlators/nfs/server/src/nfs.h index c817b5f9e47..2464eb2b261 100644 --- a/xlators/nfs/server/src/nfs.h +++ b/xlators/nfs/server/src/nfs.h @@ -58,37 +58,20 @@ struct nfs_initer_list { rpcsvc_program_t *program; }; -typedef enum { - GF_NFS_SUBVOLUME_NOTSTARTED = 1, - GF_NFS_SUBVOLUME_LOOKUPSENT, - GF_NFS_SUBVOLUME_STARTED, -} nfs_subvolume_status_t; - -struct nfs_subvolume { - xlator_t *subvol; - nfs_subvolume_status_t status; -}; - -#define gf_nfs_subvolume_started(svl) ((svl)->status == GF_NFS_SUBVOLUME_STARTED) -#define gf_nfs_subvolume_lookupsent(svl) ((svl)->status == GF_NFS_SUBVOLUME_LOOKUPSENT) -#define gf_nfs_subvolume_notstarted(svl) ((svl)->status == GF_NFS_SUBVOLUME_NOTSTARTED) - -#define gf_nfs_subvolume_unused_slot(svl) ((svl)->subvol == NULL) -#define gf_nfs_all_subvolumes_started(nf) ((nf->upsubvols == nf->allsubvols) && (!nf->subvols_started)) struct nfs_state { rpcsvc_t *rpcsvc; struct list_head versions; struct mem_pool *foppool; unsigned int memfactor; + xlator_list_t *subvols; gf_lock_t svinitlock; int allsubvols; int upsubvols; - struct nfs_subvolume *subvols; + xlator_t **initedxl; int subvols_started; int dynamicvolumes; - xlator_t *nfsx; }; #define gf_nfs_dvm_on(nfsstt) (((struct nfs_state *)nfsstt)->dynamicvolumes == GF_NFS_DVM_ON) |