diff options
author | Shehjar Tikoo <shehjart@gluster.com> | 2010-11-25 00:17:07 +0000 |
---|---|---|
committer | Anand V. Avati <avati@dev.gluster.com> | 2010-11-25 06:35:13 -0800 |
commit | ac5e34ec840889bc3eaf07d2f7091432ff698fe2 (patch) | |
tree | f03eef9d96590bde559e65f72e9c86837210dfff /xlators/nfs/server/src/nfs-inodes.c | |
parent | 9e67fd90e0df32b9a450632566855339b133d3a6 (diff) |
nfs: Undo selective changes in inode revalidation
Those changes were brought in by commit 161850285ff06e90f2c990989bab9513dd4a4289:
"nfs: re-implement logic to perform fresh lookups when lookup revalidates fail"
Signed-off-by: Shehjar Tikoo <shehjart@gluster.com>
Signed-off-by: Anand V. Avati <avati@dev.gluster.com>
BUG: 1756 (NFS must revalidate inode on first ESTALE on lookup)
URL: http://bugs.gluster.com/cgi-bin/bugzilla3/show_bug.cgi?id=1756
Diffstat (limited to 'xlators/nfs/server/src/nfs-inodes.c')
-rw-r--r-- | xlators/nfs/server/src/nfs-inodes.c | 56 |
1 files changed, 0 insertions, 56 deletions
diff --git a/xlators/nfs/server/src/nfs-inodes.c b/xlators/nfs/server/src/nfs-inodes.c index a69e1d79179..cd334525d2d 100644 --- a/xlators/nfs/server/src/nfs-inodes.c +++ b/xlators/nfs/server/src/nfs-inodes.c @@ -336,62 +336,6 @@ err: int32_t -nfs_inode_lookup_cbk (call_frame_t *frame, void *cookie, xlator_t *this, - int32_t op_ret, int32_t op_errno, inode_t *inode, - struct iatt *buf, dict_t *xattr, - struct iatt *postparent) -{ - struct nfs_fop_local *nfl = NULL; - fop_lookup_cbk_t progcbk = NULL; - inode_t *linked_inode = NULL; - uuid_t rootgfid = {0, }; - - if (op_ret == -1) - goto do_not_link; - - rootgfid[15] = 1; - if (uuid_compare (rootgfid, inode->gfid) == 0) - goto do_not_link; - - nfl = frame->local; - - linked_inode = inode_link (inode, nfl->newparent, nfl->path, buf); - - if (linked_inode) - inode_unref (linked_inode); - -do_not_link: - inodes_nfl_to_prog_data (nfl, progcbk, frame); - if (progcbk) - progcbk (frame, cookie, this, op_ret, op_errno, inode, buf, - xattr, postparent); - return 0; -} - - -int -nfs_inode_lookup (xlator_t *nfsx, xlator_t *xl, nfs_user_t *nfu, loc_t *loc, - fop_lookup_cbk_t cbk, void *local) -{ - struct nfs_fop_local *nfl = NULL; - int ret = -EFAULT; - - if ((!nfsx) || (!xl) || (!loc) || (!nfu)) - return -EFAULT; - - nfs_fop_handle_local_init (NULL, nfsx, nfl, cbk, local, ret, err); - nfl_inodes_init (nfl, NULL, NULL, loc->parent, loc->name, NULL); - ret = nfs_fop_lookup (nfsx, xl, nfu, loc, nfs_inode_lookup_cbk, nfl); - -err: - if (ret < 0) - nfs_fop_local_wipe (xl, nfl); - - return ret; -} - - -int32_t nfs_inode_unlink_cbk (call_frame_t *frame, void *cookie, xlator_t *this, int32_t op_ret, int32_t op_errno, struct iatt *preparent, struct iatt *postparent) |