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

symlink: nfs41_symlink_follow() for readdir and open

Browse source 
added nfs41_file_info.symlink_dir to replace readdir's info.cansettime hack.  when nfs_file_info_to_attributes() finds info.type==NF4LNK, it adds the FILE_ATTRIBUTE_DIRECTORY flag if info.symlink_dir is set

renamed nfs41_symlink_follow() to nfs41_symlink_target()
generalized lookup_symlink() into nfs41_symlink_follow(), which is called by readdir and open (also avoids an extra lookup)

added queries for symlink target type when doing normal GETATTRs (getattr.c) and opens with OPEN_REPARSE_POINT set (open.c)

Signed-off-by: Casey Bodley <cbodley@citi.umich.edu>
This commit is contained in:
Casey Bodley 2010-10-14 15:20:45 -04:00 • committed by unknown
parent a8f66804d5
commit eb9d9bbd4c
7 changed files with 80 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

27
daemon/readdir.c
View file

@ -170,10 +170,6 @@ static void readdir_copy_dir_info(
entry->attr_info.size;
info->fdi.FileAttributes = nfs_file_info_to_attributes(
&entry->attr_info);
/* use cansettime to flag the symlink target as a directory */
if (entry->attr_info.cansettime)
info->fdi.FileAttributes |= FILE_ATTRIBUTE_DIRECTORY;
}
static void readdir_copy_shortname(
@ -249,7 +245,7 @@ static int lookup_entry(
int status;
name.name = entry->name;
name.len = (unsigned short)entry->name_len;
name.len = (unsigned short)entry->name_len - 1;
status = format_abs_path(parent->path, &name, &path);
if (status) goto out;
@ -269,7 +265,7 @@ static int lookup_symlink(
OUT nfs41_file_info *info_out)
{
nfs41_abs_path path;
nfs41_path_fh link_parent, file;
nfs41_path_fh file;
nfs41_file_info info;
int status;
@ -277,28 +273,15 @@ static int lookup_symlink(
if (status) goto out;
file.path = &path;
/* get a filehandle for the symlink */
status = nfs41_lookup(root, session, &path, NULL, &file, &info, NULL);
status = nfs41_lookup(root, session, &path, NULL, &file, &info, &session);
if (status) goto out;
link_parent.path = &path;
last_component(path.path, path.path + path.len, &file.name);
last_component(path.path, file.name.name, &link_parent.name);
/* attempt to follow the symlink */
status = nfs41_symlink_follow(session, &file, &path);
status = nfs41_symlink_follow(root, session, &file, &info);
if (status) goto out;
/* get attributes for the target */
status = nfs41_lookup(root, session, &path, &link_parent, NULL, &info, NULL);
if (status) goto out;
if (info.type == NF4LNK) {
status = lookup_symlink(root, session, &link_parent, &file.name, &info);
if (status) goto out;
info_out->cansettime = info.cansettime;
} else if (info.type == NF4DIR)
info_out->cansettime = 1;
info_out->symlink_dir = info.type == NF4DIR;
out:
return status;
}