From 58ce5f46af7e08db3d786c597ec5144294fbd099 Mon Sep 17 00:00:00 2001 From: Shehjar Tikoo Date: Thu, 7 Oct 2010 05:23:59 +0000 Subject: 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 Signed-off-by: Vijay Bellur BUG: 1724 (kernel untar fails during add-brick) URL: http://bugs.gluster.com/cgi-bin/bugzilla3/show_bug.cgi?id=1724 --- xlators/nfs/server/src/nfs-common.c | 42 ------------------------------------- 1 file changed, 42 deletions(-) (limited to 'xlators/nfs/server/src/nfs-common.c') diff --git a/xlators/nfs/server/src/nfs-common.c b/xlators/nfs/server/src/nfs-common.c index c5044313e..6628c297f 100644 --- a/xlators/nfs/server/src/nfs-common.c +++ b/xlators/nfs/server/src/nfs-common.c @@ -33,7 +33,6 @@ #include "nfs-mem-types.h" #include "rpcsvc.h" #include "iatt.h" -#include "nfs.h" #include @@ -394,44 +393,3 @@ err: return ret; } - - -int -__is_nfs_subvolume_disabled (struct nfs_state *nfs, xlator_t *xl) -{ - int x = 0; - int notstarted = 0; - - if ((!nfs) || (!xl)) - return 1; - - for (;x < nfs->allsubvols; ++x) { - if (!((&nfs->subvols[x])->subvol == xl)) - continue; - - if (gf_nfs_subvolume_notstarted (&nfs->subvols[x])) { - notstarted = 1; - goto out; - } - } -out: - return notstarted; -} - - -int -is_nfs_subvolume_disabled (struct nfs_state *nfs, xlator_t *xl) -{ - int notstarted = 0; - - if ((!nfs) || (!xl)) - return 1; - - LOCK (&nfs->svinitlock); - { - notstarted = __is_nfs_subvolume_disabled (nfs, xl); - } - UNLOCK (&nfs->svinitlock); - - return notstarted; -} -- cgit