jimzah/openafs
1
0
Fork 0
mirror of https://git.openafs.org/openafs.git synced 2025-01-18 15:00:12 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

LINUX: Use correct type of error in flock code

Browse Source 
The flock code gets a kernel error code from afs_posix_lock_file()
but then passes this error code through afs_convert_code (which sees
that it is already negative, and returns EIO). Instead, we should just
return afs_posix_lock_file()'s code direct to our caller.

Reviewed-on: http://gerrit.openafs.org/2534
Reviewed-by: Derrick Brashear <shadow@dementia.org>
Tested-by: Derrick Brashear <shadow@dementia.org>
(cherry picked from commit 5abe706a7e)
Change-Id: I8e12c9804cc81c8c88f820f55abd4ce863525c9a
Reviewed-on: http://gerrit.openafs.org/3533
This commit is contained in:
Simon Wilkinson 2010-08-11 17:25:36 +01:00 committed by Derrick Brashear
parent 707a959c96
commit beaf16069e
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/afs/LINUX/osi_vnodeops.c
View File

@ -509,7 +509,7 @@ afs_linux_lock(struct file *fp, int cmd, struct file_lock *flp)
#endif /* F_GETLK64 && F_GETLK != F_GETLK64 */
AFS_GLOCK();
code = afs_lockctl(vcp, &flock, cmd, credp);
code = afs_convert_code(afs_lockctl(vcp, &flock, cmd, credp));
AFS_GUNLOCK();
#ifdef AFS_LINUX24_ENV
@ -569,7 +569,7 @@ afs_linux_lock(struct file *fp, int cmd, struct file_lock *flp)
flp->fl_end = flock.l_start + flock.l_len - 1;
crfree(credp);
return afs_convert_code(code);
return code;
}
#ifdef STRUCT_FILE_OPERATIONS_HAS_FLOCK