diff options
| author | Anand Avati <avati@gluster.com> | 2010-09-03 13:58:48 +0000 |
|---|---|---|
| committer | Vijay Bellur <vijay@dev.gluster.com> | 2010-09-04 01:45:06 -0700 |
| commit | ac60a2a7f3c7b07830669e282d9fc796cbc78f38 (patch) | |
| tree | e99cb728b67e18498440fd55c2ab46b0a5c16d06 /xlators/nfs/server | |
| parent | 2822157056d8347518f7e1b8bf9ee04bea7286ae (diff) | |
gfid: changes in inode management
- incorporate usage of uuid (gfid) as the key for finding inodes
- deprecate inode number/generation number based inode_get
- undo code specific to generation numbers (attic list etc.)
Signed-off-by: Anand V. Avati <avati@blackhole.gluster.com>
Signed-off-by: Anand V. Avati <avati@amp.gluster.com>
Signed-off-by: Vijay Bellur <vijay@dev.gluster.com>
BUG: 971 (dynamic volume management)
URL: http://bugs.gluster.com/cgi-bin/bugzilla3/show_bug.cgi?id=971
Diffstat (limited to 'xlators/nfs/server')
| -rw-r--r-- | xlators/nfs/server/src/mount3.c | 6 | ||||
| -rw-r--r-- | xlators/nfs/server/src/nfs3-helpers.c | 3 |
2 files changed, 3 insertions, 6 deletions
diff --git a/xlators/nfs/server/src/mount3.c b/xlators/nfs/server/src/mount3.c index 2a7a36c8f7e..c61cf0a488a 100644 --- a/xlators/nfs/server/src/mount3.c +++ b/xlators/nfs/server/src/mount3.c @@ -306,8 +306,8 @@ mnt3svc_mount_inode (rpcsvc_request_t *req, struct mount3_state *ms, ret = nfs_inode_loc_fill (exportinode, &exportloc); if (ret < 0) { gf_log (GF_MNT, GF_LOG_ERROR, "Loc fill failed for export inode" - ": ino %"PRIu64", gen: %"PRIu64", volume: %s", - exportinode->ino, exportinode->generation, xl->name); + ": ino %"PRIu64", volume: %s", + exportinode->ino, xl->name); goto err; } @@ -446,7 +446,7 @@ __mnt3_resolve_export_subdir_comp (mnt3_resolve_t *mres) goto err; parino = mres->resolveloc.inode->ino; - pargen = mres->resolveloc.inode->generation; + /* Wipe the contents of the previous component */ nfs_loc_wipe (&mres->resolveloc); ret = nfs_entry_loc_fill (mres->exp->vol->itable, parino, pargen, diff --git a/xlators/nfs/server/src/nfs3-helpers.c b/xlators/nfs/server/src/nfs3-helpers.c index c10954ab996..5a5a0b29df3 100644 --- a/xlators/nfs/server/src/nfs3-helpers.c +++ b/xlators/nfs/server/src/nfs3-helpers.c @@ -2580,7 +2580,6 @@ nfs3_fh_resolve_found_entry (nfs3_call_state_t *cs, gf_dirent_t *candidate) return -EFAULT; dirino = cs->resolvedloc.inode->ino; - dirgen = cs->resolvedloc.inode->generation; nfs_loc_wipe (&cs->resolvedloc); ret = nfs_entry_loc_fill (cs->vol->itable, dirino, dirgen, @@ -2644,7 +2643,6 @@ nfs3_fh_resolve_found_parent (nfs3_call_state_t *cs, gf_dirent_t *candidate) return -EFAULT; dirino = cs->resolvedloc.inode->ino; - dirgen = cs->resolvedloc.inode->generation; nfs_loc_wipe (&cs->resolvedloc); ret = nfs_entry_loc_fill (cs->vol->itable, dirino, dirgen, @@ -2862,7 +2860,6 @@ nfs3_fh_resolve_check_response (nfs3_call_state_t *cs, gf_dirent_t *candidate, return ret; dirino = cs->resolvedloc.inode->ino; - dirgen = cs->resolvedloc.inode->generation; switch (response) { |