summaryrefslogtreecommitdiffstats
path: root/xlators/nfs/server/src/nfs-fops.c
diff options
context:
space:
mode:
authorVijay Bellur <vijay@dev.gluster.com>2010-10-11 12:32:04 -0700
committerVijay Bellur <vijay@dev.gluster.com>2010-10-11 12:32:04 -0700
commitf182151cf338cad36d1d503f33b65ca40785b797 (patch)
treefef414fce98d49f38c52d638f6fdee55b45af235 /xlators/nfs/server/src/nfs-fops.c
parent61308de7645f1df462bef50e9c22237899218c65 (diff)
Revert "nfs: re-implement logic to perform fresh lookups when lookup revalidates fail"v3.1.0qa46
This reverts commit 563ef3d12f8d7a927b403d04c279d9fc702faad0.
Diffstat (limited to 'xlators/nfs/server/src/nfs-fops.c')
-rw-r--r--xlators/nfs/server/src/nfs-fops.c25
1 files changed, 0 insertions, 25 deletions
diff --git a/xlators/nfs/server/src/nfs-fops.c b/xlators/nfs/server/src/nfs-fops.c
index f748c1fa34c..4928deb969f 100644
--- a/xlators/nfs/server/src/nfs-fops.c
+++ b/xlators/nfs/server/src/nfs-fops.c
@@ -74,8 +74,6 @@ nfs_fop_local_wipe (xlator_t *nfsx, struct nfs_fop_local *l)
if (l->dictgfid)
dict_unref (l->dictgfid);
- loc_wipe (&l->revalidate_loc);
-
mem_put (nfs->foppool, l);
return;
@@ -302,27 +300,9 @@ nfs_fop_lookup_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
{
struct nfs_fop_local *local = NULL;
fop_lookup_cbk_t progcbk;
- inode_table_t *itable = NULL;
- xlator_t *xl = NULL;
- xl = cookie;
nfl_to_prog_data (local, progcbk, frame);
nfs_fop_restore_root_ino (local, buf, NULL, NULL, postparent);
-
- if (op_ret == -1 && local->is_revalidate == 1) {
- /* perform a fresh lookup if revalidate fails */
- itable = local->revalidate_loc.inode->table;
- inode_unref (local->revalidate_loc.inode);
- local->revalidate_loc.inode = inode_new (itable);
-
- local->is_revalidate = 2; /* prevent entering revalidate loops */
-
- STACK_WIND_COOKIE (frame, nfs_fop_lookup_cbk, xl, xl,
- xl->fops->lookup, &local->revalidate_loc,
- local->dictgfid);
- return 0;
- }
-
if (progcbk)
progcbk (frame, cookie, this, op_ret, op_errno, inode, buf,
xattr, postparent);
@@ -349,11 +329,6 @@ nfs_fop_lookup (xlator_t *nfsx, xlator_t *xl, nfs_user_t *nfu, loc_t *loc,
nfs_fop_save_root_ino (nfl, loc);
nfs_fop_gfid_setup (nfl, ret, err);
- if (!uuid_is_null (loc->inode->gfid)) {
- nfl->is_revalidate = 1;
- loc_copy (&nfl->revalidate_loc, loc);
- }
-
STACK_WIND_COOKIE (frame, nfs_fop_lookup_cbk, xl, xl,
xl->fops->lookup, loc, nfl->dictgfid);