nilfs2: remove unlikely directive causing mis-conversion of error code
commitf76cea526e01055bedb51a2b318f4d711e0144c4
authorRyusuke Konishi <konishi.ryusuke@lab.ntt.co.jp>
Thu, 18 Jun 2009 02:42:53 +0000 (18 11:42 +0900)
committerGreg Kroah-Hartman <gregkh@suse.de>
Thu, 30 Jul 2009 21:39:47 +0000 (30 14:39 -0700)
treee7415a1c3f026b4566e4a5f0987da4991e9ecdaa
parentc637cbe1701c396f8c3dbf0b11c0c77d70980618
nilfs2: remove unlikely directive causing mis-conversion of error code

commit 0cfae3d8795f388f9de78adb0171520d19da77e9 upstream.

The following error code handling in nilfs_segctor_write() function
wrongly converted negative error codes to a truth value (i.e. 1):

   err = unlikely(err) ? : res;

which originaly meant to be

   err = err ? : res;

This mis-conversion caused that write or sync functions receive the
unexpected error code.  This fixes the bug by removing the unlikely
directive.

Signed-off-by: Ryusuke Konishi <konishi.ryusuke@lab.ntt.co.jp>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
fs/nilfs2/segment.c