Prev: [091/145] p54usb: Add the USB ID for Belkin (Accton) FD7050E ver 1010ec
Next: [045/145] sky2: fix transmit DMA map leakage
From: Greg KH on 12 Mar 2010 19:50 2.6.32-stable review patch. If anyone has any objections, please let me know. ---------------- From: Tao Ma <tao.ma(a)oracle.com> commit cbaee472f274ea9a98aabe47025f6e5551acadcb upstream. In ocfs2_direct_IO_get_blocks, we only need to bug out in case of we are going to write a recounted extent rec. What a silly bug introduced by me! Signed-off-by: Tao Ma <tao.ma(a)oracle.com> Signed-off-by: Joel Becker <joel.becker(a)oracle.com> Signed-off-by: Greg Kroah-Hartman <gregkh(a)suse.de> --- fs/ocfs2/aops.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) --- a/fs/ocfs2/aops.c +++ b/fs/ocfs2/aops.c @@ -591,8 +591,9 @@ static int ocfs2_direct_IO_get_blocks(st goto bail; } - /* We should already CoW the refcounted extent. */ - BUG_ON(ext_flags & OCFS2_EXT_REFCOUNTED); + /* We should already CoW the refcounted extent in case of create. */ + BUG_ON(create && (ext_flags & OCFS2_EXT_REFCOUNTED)); + /* * get_more_blocks() expects us to describe a hole by clearing * the mapped bit on bh_result(). -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo(a)vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/ |