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

removing unused arg from nfs41_link

Browse source
This commit is contained in:
Olga Kornievskaia 2012-02-08 18:33:37 -05:00
parent 43424fc653
commit 5b91c662c9
3 changed files with 6 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

12
daemon/nfs41_ops.c
View file

@ -1385,7 +1385,6 @@ int nfs41_link(
IN nfs41_path_fh *src, IN nfs41_path_fh *src,
IN nfs41_path_fh *dst_dir, IN nfs41_path_fh *dst_dir,
IN const nfs41_component *target, IN const nfs41_component *target,
OUT OPTIONAL nfs41_path_fh *link_out,
OUT nfs41_file_info *cinfo) OUT nfs41_file_info *cinfo)
{ {
int status; int status;
@ -1407,9 +1406,6 @@ int nfs41_link(
nfs41_file_info info = { 0 }; nfs41_file_info info = { 0 };
nfs41_path_fh file; nfs41_path_fh file;
if (link_out == NULL)
link_out = &file;
init_getattr_request(&info.attrmask); init_getattr_request(&info.attrmask);
init_getattr_request(&cinfo->attrmask); init_getattr_request(&cinfo->attrmask);
cinfo->attrmask.arr[0] |= FATTR4_WORD0_FSID; cinfo->attrmask.arr[0] |= FATTR4_WORD0_FSID;
@ -1454,7 +1450,7 @@ int nfs41_link(
/* GETFH(target) */ /* GETFH(target) */
compound_add_op(&compound, OP_GETFH, NULL, &getfh_res); compound_add_op(&compound, OP_GETFH, NULL, &getfh_res);
getfh_res.fh = &link_out->fh; getfh_res.fh = &file.fh;
status = compound_encode_send_decode(session, &compound, TRUE); status = compound_encode_send_decode(session, &compound, TRUE);
if (status) if (status)
@ -1464,9 +1460,9 @@ int nfs41_link(
goto out; goto out;
/* fill in the file handle's fileid and superblock */ /* fill in the file handle's fileid and superblock */
link_out->fh.fileid = cinfo->fileid; file.fh.fileid = cinfo->fileid;
status = nfs41_superblock_for_fh(session, status = nfs41_superblock_for_fh(session,
&cinfo->fsid, &dst_dir->fh, link_out); &cinfo->fsid, &dst_dir->fh, &file);
if (status) if (status)
goto out; goto out;
@ -1481,7 +1477,7 @@ int nfs41_link(
sizeof(bitmap4)); sizeof(bitmap4));
AcquireSRWLockShared(&dst_dir->path->lock); AcquireSRWLockShared(&dst_dir->path->lock);
nfs41_name_cache_insert(session_name_cache(session), nfs41_name_cache_insert(session_name_cache(session),
dst_dir->path->path, target, &link_out->fh, dst_dir->path->path, target, &file.fh,
cinfo, &link_res.cinfo, OPEN_DELEGATE_NONE); cinfo, &link_res.cinfo, OPEN_DELEGATE_NONE);
ReleaseSRWLockShared(&dst_dir->path->lock); ReleaseSRWLockShared(&dst_dir->path->lock);

1
daemon/nfs41_ops.h
View file

@ -1170,7 +1170,6 @@ int nfs41_link(
IN nfs41_path_fh *src, IN nfs41_path_fh *src,
IN nfs41_path_fh *dst_dir, IN nfs41_path_fh *dst_dir,
IN const nfs41_component *target, IN const nfs41_component *target,
OUT OPTIONAL nfs41_path_fh *link_out,
OUT nfs41_file_info *cinfo); OUT nfs41_file_info *cinfo);
/* symlink.c */ /* symlink.c */

4
daemon/setattr.c
View file

@ -451,8 +451,8 @@ static int handle_nfs41_link(setattr_upcall_args *args)
nfs41_delegation_return(state->session, &state->file, nfs41_delegation_return(state->session, &state->file,
OPEN_DELEGATE_READ, FALSE); OPEN_DELEGATE_READ, FALSE);
status = nfs41_link(state->session, &state->file, status = nfs41_link(state->session, &state->file, &dst_dir, &dst_name,
&dst_dir, &dst_name, NULL, &info); &info);
if (status) { if (status) {
dprintf(1, "nfs41_link() failed with error %s.\n", dprintf(1, "nfs41_link() failed with error %s.\n",
nfs_error_string(status)); nfs_error_string(status));