Commit f0dd9592 authored Sep 08, 2011 by Li Zefan Committed by David Sterba Oct 20, 2011

Btrfs: fix direct-io vs nodatacow



To reproduce the bug:

  # mount -o nodatacow /dev/sda7 /mnt/
  # dd if=/dev/zero of=/mnt/tmp bs=4K count=1
  1+0 records in
  1+0 records out
  4096 bytes (4.1 kB) copied, 0.000136115 s, 30.1 MB/s
  # dd if=/dev/zero of=/mnt/tmp bs=4K count=1 conv=notrunc oflag=direct
  dd: writing `/mnt/tmp': Input/output error
  1+0 records in
  0+0 records out

btrfs_ordered_update_i_size() may return 1, but btrfs_endio_direct_write()
mistakenly takes it as an error.

Signed-off-by: Li Zefan <lizf@cn.fujitsu.com>

parent 560f7d75

fs/btrfs/inode.c

+1 −2

Original line number	Diff line number	Diff line
		@@ -5777,8 +5777,7 @@ again:
		if (test_bit(BTRFS_ORDERED_NOCOW, &ordered->flags)) {
		ret = btrfs_ordered_update_i_size(inode, 0, ordered);
		if (!ret)
		ret = btrfs_update_inode(trans, root, inode);
		err = ret;
		err = btrfs_update_inode(trans, root, inode);
		goto out;
		}

Admin message