diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-04-05 16:21:15 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-04-05 16:21:15 -0400 |
| commit | 795d580baec0d5386b83a8b557df47c20810e86b (patch) | |
| tree | d0387c37562e9e27a4f43cf7ae425319cbdad359 /fs/btrfs/ioctl.c | |
| parent | 449cedf099b23a250e7d61982e35555ccb871182 (diff) | |
| parent | 109f6aef5fc436f355ad027f4d97bd696df2049a (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable
* git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable:
Btrfs: add check for changed leaves in setup_leaf_for_split
Btrfs: create snapshot references in same commit as snapshot
Btrfs: fix small race with delalloc flushing waitqueue's
Btrfs: use add_to_page_cache_lru, use __page_cache_alloc
Btrfs: fix chunk allocate size calculation
Btrfs: kill max_extent mount option
Btrfs: fail to mount if we have problems reading the block groups
Btrfs: check btrfs_get_extent return for IS_ERR()
Btrfs: handle kmalloc() failure in inode lookup ioctl
Btrfs: dereferencing freed memory
Btrfs: Simplify num_stripes's calculation logical for __btrfs_alloc_chunk()
Btrfs: Add error handle for btrfs_search_slot() in btrfs_read_chunk_tree()
Btrfs: Remove unnecessary finish_wait() in wait_current_trans()
Btrfs: add NULL check for do_walk_down()
Btrfs: remove duplicate include in ioctl.c
Fix trivial conflict in fs/btrfs/compression.c due to slab.h include
cleanups.
Diffstat (limited to 'fs/btrfs/ioctl.c')
| -rw-r--r-- | fs/btrfs/ioctl.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/fs/btrfs/ioctl.c b/fs/btrfs/ioctl.c index 9b3d73a0fdc8..e84ef60ffe35 100644 --- a/fs/btrfs/ioctl.c +++ b/fs/btrfs/ioctl.c | |||
| @@ -49,7 +49,6 @@ | |||
| 49 | #include "print-tree.h" | 49 | #include "print-tree.h" |
| 50 | #include "volumes.h" | 50 | #include "volumes.h" |
| 51 | #include "locking.h" | 51 | #include "locking.h" |
| 52 | #include "ctree.h" | ||
| 53 | 52 | ||
| 54 | /* Mask out flags that are inappropriate for the given type of inode. */ | 53 | /* Mask out flags that are inappropriate for the given type of inode. */ |
| 55 | static inline __u32 btrfs_mask_flags(umode_t mode, __u32 flags) | 54 | static inline __u32 btrfs_mask_flags(umode_t mode, __u32 flags) |
| @@ -512,7 +511,7 @@ static int should_defrag_range(struct inode *inode, u64 start, u64 len, | |||
| 512 | em = btrfs_get_extent(inode, NULL, 0, start, len, 0); | 511 | em = btrfs_get_extent(inode, NULL, 0, start, len, 0); |
| 513 | unlock_extent(io_tree, start, start + len - 1, GFP_NOFS); | 512 | unlock_extent(io_tree, start, start + len - 1, GFP_NOFS); |
| 514 | 513 | ||
| 515 | if (!em) | 514 | if (IS_ERR(em)) |
| 516 | return 0; | 515 | return 0; |
| 517 | } | 516 | } |
| 518 | 517 | ||
| @@ -1213,6 +1212,9 @@ static noinline int btrfs_ioctl_ino_lookup(struct file *file, | |||
| 1213 | return -EPERM; | 1212 | return -EPERM; |
| 1214 | 1213 | ||
| 1215 | args = kmalloc(sizeof(*args), GFP_KERNEL); | 1214 | args = kmalloc(sizeof(*args), GFP_KERNEL); |
| 1215 | if (!args) | ||
| 1216 | return -ENOMEM; | ||
| 1217 | |||
| 1216 | if (copy_from_user(args, argp, sizeof(*args))) { | 1218 | if (copy_from_user(args, argp, sizeof(*args))) { |
| 1217 | kfree(args); | 1219 | kfree(args); |
| 1218 | return -EFAULT; | 1220 | return -EFAULT; |
| @@ -1376,6 +1378,7 @@ static int btrfs_ioctl_defrag(struct file *file, void __user *argp) | |||
| 1376 | sizeof(*range))) { | 1378 | sizeof(*range))) { |
| 1377 | ret = -EFAULT; | 1379 | ret = -EFAULT; |
| 1378 | kfree(range); | 1380 | kfree(range); |
| 1381 | goto out; | ||
| 1379 | } | 1382 | } |
| 1380 | /* compression requires us to start the IO */ | 1383 | /* compression requires us to start the IO */ |
| 1381 | if ((range->flags & BTRFS_DEFRAG_RANGE_COMPRESS)) { | 1384 | if ((range->flags & BTRFS_DEFRAG_RANGE_COMPRESS)) { |