]> git.karo-electronics.de Git - linux-beck.git/commit
NFSD, VFS: Remove dead code in nfsd_rename()
authorJesper Juhl <jj@chaosbits.net>
Sat, 5 Mar 2011 23:30:35 +0000 (00:30 +0100)
committerJ. Bruce Fields <bfields@redhat.com>
Mon, 7 Mar 2011 17:05:14 +0000 (12:05 -0500)
commit46d4cef9cf54f2f8b15216e3f6dad69750c69e0c
tree43996e82b91a206579d57b99c620be40e78a3f95
parent35079582e72efcabf7c70f3d3ee4f96e6f196606
NFSD, VFS: Remove dead code in nfsd_rename()

Currently we have the following code in fs/nfsd/vfs.c::nfsd_rename() :

...
host_err = nfsd_break_lease(odentry->d_inode);
if (host_err)
goto out_drop_write;
if (ndentry->d_inode) {
host_err = nfsd_break_lease(ndentry->d_inode);
if (host_err)
goto out_drop_write;
}
if (host_err)
goto out_drop_write;
...

'host_err' is guaranteed to be 0 by the time we test 'ndentry->d_inode'.
If 'host_err' becomes != 0 inside the 'if' statement, then we goto
'out_drop_write'. So, after the 'if' statement there is no way that
'host_err' can be anything but 0, so the test afterwards is just dead
code.
This patch removes the dead code.

Signed-off-by: Jesper Juhl <jj@chaosbits.net>
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
fs/nfsd/vfs.c