evin/ms-nfs41-client
3
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

cosmetic: moved lookup_entry()

Browse source 
Signed-off-by: Casey Bodley <cbodley@citi.umich.edu>
This commit is contained in:
Casey Bodley 2010-10-12 09:52:41 -04:00
parent 30decd1af7
commit 0d3af99159
1 changed files with 34 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

68
daemon/readdir.c
View file

@ -216,6 +216,40 @@ static void readdir_copy_filename(
memcpy(name_out, name, name_size);
}
static int lookup_entry(
IN nfs41_root *root,
IN nfs41_session *session,
IN nfs41_path_fh *parent,
OUT nfs41_readdir_entry *entry)
{
nfs41_abs_path path;
nfs41_path_fh file;
int status;
/* format an absolute path 'parent\name' */
InitializeSRWLock(&path.lock);
abs_path_copy(&path, parent->path);
if (path.len + entry->name_len >= NFS41_MAX_PATH_LEN) {
status = ERROR_BUFFER_OVERFLOW;
goto out;
}
StringCchPrintfA(path.path + path.len,
NFS41_MAX_PATH_LEN - path.len, "\\%s", entry->name);
path.len += (unsigned short)entry->name_len;
path_fh_init(&file, &path);
status = nfs41_lookup(root, session, &path,
NULL, NULL, &entry->attr_info, NULL);
if (status) {
dprintf(1, "nfs41_lookup failed with %s\n", nfs_error_string(status));
status = nfs_to_windows_error(status, ERROR_BAD_NET_RESP);
goto out;
}
out:
return status;
}
static int readdir_copy_entry(
IN readdir_upcall_args *args,
IN nfs41_readdir_entry *entry,
@ -369,40 +403,6 @@ out:
return status;
}
static int lookup_entry(
IN nfs41_root *root,
IN nfs41_session *session,
IN nfs41_path_fh *parent,
OUT nfs41_readdir_entry *entry)
{
nfs41_abs_path path;
nfs41_path_fh file;
int status;
/* format an absolute path 'parent\name' */
InitializeSRWLock(&path.lock);
abs_path_copy(&path, parent->path);
if (path.len + entry->name_len >= NFS41_MAX_PATH_LEN) {
status = ERROR_BUFFER_OVERFLOW;
goto out;
}
StringCchPrintfA(path.path + path.len,
NFS41_MAX_PATH_LEN - path.len, "\\%s", entry->name);
path.len += (unsigned short)entry->name_len;
path_fh_init(&file, &path);
status = nfs41_lookup(root, session, &path,
NULL, NULL, &entry->attr_info, NULL);
if (status) {
dprintf(1, "nfs41_lookup failed with %s\n", nfs_error_string(status));
status = nfs_to_windows_error(status, ERROR_BAD_NET_RESP);
goto out;
}
out:
return status;
}
int handle_readdir(nfs41_upcall *upcall)
{
int status;