Merge git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 15 May 2010 19:55:31 +0000 (12:55 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 15 May 2010 19:55:31 +0000 (12:55 -0700)
commit18e41da89d55014d25b9a24502ee92b7f50599f9
tree5ce8ebd7456f377e4cfbff0ae83e84295617a4a8
parent43aa7ac736a4e21aae4882bd8f7c67403aed45b8
parent5dc6416414fb3ec6e2825fd4d20c8bf1d7fe0395
Merge git://git./linux/kernel/git/mason/btrfs-unstable

* git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable:
  Btrfs: check for read permission on src file in the clone ioctl
fs/btrfs/ioctl.c