From e14dec55e6600edb60ce5184b4ab1f646c68947b Mon Sep 17 00:00:00 2001 From: Andrew Deason Date: Tue, 15 Nov 2011 13:18:48 -0600 Subject: [PATCH] afs: Leave cellnum alone for explicit mtpt cell When a mountpoint is given an explicit cell, don't alter cellnum. Cellnum represents the cell for the parent, and is used for determining whether or not we're crossing a cell boundary. Previously, this code forced the mount point to always be treated as foreign (for a mountpoint prefixed with a cell name), or to always be treated as local (for a mountpoint prefixed with a cell number). Change-Id: I7b98ccc94bf61dc3d7be0b7d6b54019cd797e884 Reviewed-on: http://gerrit.openafs.org/6051 Reviewed-by: Marc Dionne Tested-by: BuildBot Reviewed-by: Derrick Brashear --- src/afs/VNOPS/afs_vnop_lookup.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/afs/VNOPS/afs_vnop_lookup.c b/src/afs/VNOPS/afs_vnop_lookup.c index 24e05a560d..1a15f49b40 100644 --- a/src/afs/VNOPS/afs_vnop_lookup.c +++ b/src/afs/VNOPS/afs_vnop_lookup.c @@ -67,14 +67,14 @@ EvalMountData(char type, char *data, afs_uint32 states, afs_uint32 cellnum, /* Start by figuring out and finding the cell */ cpos = afs_strchr(data, ':'); /* if cell name present */ if (cpos) { + afs_uint32 mtptCellnum; volnamep = cpos + 1; *cpos = 0; - if ((afs_strtoi_r(data, &endptr, &cellnum) == 0) && - (endptr == cpos)) - tcell = afs_GetCell(cellnum, READ_LOCK); - else { + if ((afs_strtoi_r(data, &endptr, &mtptCellnum) == 0) && + (endptr == cpos)) { + tcell = afs_GetCell(mtptCellnum, READ_LOCK); + } else { tcell = afs_GetCellByName(data, READ_LOCK); - cellnum = 0; } *cpos = ':'; } else if (cellnum) {