mirror of
https://github.com/team-infusion-developers/android_kernel_samsung_msm8976.git
synced 2024-11-07 04:09:21 +00:00
[PATCH] 9p: fix fid behavior on failed remove
Based on a bug report from Russ Ross <russruss@gmail.com> According to the spec: "The remove request asks the file server both to remove the file represented by fid and to clunk the fid, even if the remove fails." but the Linux client seems to expect the fid to be valid after a failed remove attempt. Specifically, I'm getting this behavior when attempting to remove a non-empty directory. Signed-off-by: Eric Van Hensbergen <ericvh@gmail.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
parent
1f525f16e0
commit
834a9b8ca7
1 changed files with 3 additions and 3 deletions
|
@ -434,11 +434,11 @@ static int v9fs_remove(struct inode *dir, struct dentry *file, int rmdir)
|
|||
result = v9fs_t_remove(v9ses, fid, &fcall);
|
||||
if (result < 0) {
|
||||
PRINT_FCALL_ERROR("remove fails", fcall);
|
||||
} else {
|
||||
v9fs_put_idpool(fid, &v9ses->fidpool);
|
||||
v9fs_fid_destroy(v9fid);
|
||||
}
|
||||
|
||||
v9fs_put_idpool(fid, &v9ses->fidpool);
|
||||
v9fs_fid_destroy(v9fid);
|
||||
|
||||
kfree(fcall);
|
||||
return result;
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue