• Jesper Juhl's avatar
    NFSD, VFS: Remove dead code in nfsd_rename() · 46d4cef9
    Jesper Juhl authored
    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: default avatarJesper Juhl <jj@chaosbits.net>
    Signed-off-by: default avatarJ. Bruce Fields <bfields@redhat.com>
    46d4cef9
vfs.c 53.1 KB