- 25 Sep, 2008 40 commits
-
-
Chris Mason authored
Signed-off-by:Chris Mason <chris.mason@oracle.com>
-
Chris Mason authored
Signed-off-by: -
Jeff Mahoney authored
In openSUSE 10.3, AppArmor modifies remove_suid to take a struct path rather than just a dentry. This patch tests that the kernel is openSUSE 10.3 or newer and adjusts the call accordingly. Debian/Ubuntu with AppArmor applied will also need a similar patch. Maintainers of btrfs under those distributions should build on this patch or, alternatively, alter their package descriptions to add -DREMOVE_SUID_PATH to the compiler command line. Signed-off-by:
Jeff Mahoney <jeffm@suse.com> - --- /dev/null 1970-01-01 00:00:00.000000000 +0000 +++ b/compat.h 2008-02-06 16:46:13.000000000 -0500 @@ -0,0 +1,15 @@ +#ifndef _COMPAT_H_ +#define _COMPAT_H_ + + +/* + * Even if AppArmor isn't enabled, it still has different prototypes. + * Add more distro/version pairs here to declare which has AppArmor applied. + */ +#if defined(CONFIG_SUSE_KERNEL) +# if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,22) +# define REMOVE_SUID_PATH 1 +# endif +#endif + +#endif /* _COMPAT_H_ */ - --- a/file.c 2008-02-06 11:37:39.000000000 -0500 +++ b/file.c 2008-02-06 16:46:23.000000000 -0500 @@ -37,6 +37,7 @@ #include "ordered-data.h" #include "ioctl.h" #include "print-tree.h" +#include "compat.h" static int btrfs_copy_from_user(loff_t pos, int num_pages, int write_bytes, @@ -790,7 +791,11 @@ static ssize_t btrfs_file_write(struct f goto out_nolock; if (count == 0) goto out_nolock; +#ifdef REMOVE_SUID_PATH + err = remove_suid(&file->f_path); +#else err = remove_suid(fdentry(file)); +#endif if (err) goto out_nolock; file_update_time(file); Signed-off-by:
-
Chris Mason authored
Signed-off-by: -
Chris Mason authored
Signed-off-by: -
Sage Weil authored
Add a new ioctl to clone file data Signed-off-by: -
Chris Mason authored
2.6.18 seems to get caught in an infinite loop when cancel_rearming_delayed_workqueue is called more than once, so this switches to cancel_delayed_work, which is arguably more correct. Also, balance_dirty_pages can run into problems with 2.6.18 based kernels because it doesn't have the per-bdi dirty limits. This avoids calling balance_dirty_pages on the btree inode unless there is actually something to balance, which is a good optimization in general. Finally there's a compile fix for ordered-data.h Signed-off-by: -
Chris Mason authored
Signed-off-by: -
Chris Mason authored
Signed-off-by: -
Chris Mason authored
Signed-off-by: -
Chris Mason authored
Signed-off-by: -
Chris Mason authored
Signed-off-by: -
Chris Mason authored
Signed-off-by: -
Chris Mason authored
Signed-off-by: -
Chris Mason authored
Signed-off-by: -
Chris Mason authored
Signed-off-by: -
Chris Mason authored
Signed-off-by: -
Chris Mason authored
Signed-off-by: -
Chris Mason authored
Signed-off-by: -
Chris Mason authored
balance level starts by trying to empty the middle block, and then pushes from the right to the middle. This might empty the right block and leave a small number of pointers in the middle. Signed-off-by: -
Chris Mason authored
Signed-off-by: -
Chris Mason authored
Signed-off-by: -
Chris Mason authored
Signed-off-by: -
Chris Mason authored
Signed-off-by: -
Chris Mason authored
The generic O_DIRECT code assumes all the bios have the same bdev, which isn't true for multi-device btrfs. Signed-off-by: -
Chris Mason authored
Signed-off-by: -
Chris Mason authored
Signed-off-by: -
Chris Mason authored
This allows other code that needs to walk every device in the FS to do so without locking against allocations. Signed-off-by: -
Chris Mason authored
Signed-off-by: -
Chris Mason authored
Signed-off-by: -
Chris Mason authored
Signed-off-by: -
Chris Mason authored
This properly reflects the first 1MB we skip at the start of the device Signed-off-by: -
Chris Mason authored
Signed-off-by: -
Chris Mason authored
btrfs_invalidatepage is not allowed to leave pages around on the lru. Any such pages will trigger an oops later on because the VM will see page->private and assume it is a buffer head. This also forces extra flushes of the async work queues before dropping all the pages on the btree inode during unmount. Left over items on the work queues are one possible cause of busy state ranges during truncate_inode_pages. Signed-off-by: -
Chris Mason authored
Signed-off-by: -
Chris Mason authored
Signed-off-by: -
Chris Mason authored
Signed-off-by: -
Chris Mason authored
The btree inode should only have a single extent_map in the cache, it doesn't make sense to ever drop it. Signed-off-by: -
Chris Mason authored
Signed-off-by: -
Chris Mason authored
Signed-off-by:
-
