summaryrefslogtreecommitdiffstats
path: root/fs/btrfs/ioctl.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-05-14 19:18:44 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2009-05-14 19:18:44 -0700
commit5732c468495effd3089c1c893f3eba9a8a1d373c (patch)
tree6cb79b79acde60efd82af296fd312569034d5a58 /fs/btrfs/ioctl.c
parent45d447406a19cbfd42720f066f156f4eb9d68801 (diff)
parent9f55684c2d9869e8cc53595a3fee679958511cfb (diff)
downloadop-kernel-dev-5732c468495effd3089c1c893f3eba9a8a1d373c.zip
op-kernel-dev-5732c468495effd3089c1c893f3eba9a8a1d373c.tar.gz
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: Spelling fix in btrfs_lookup_first_block_group comments Btrfs: make show_options result match actual option names Btrfs: remove outdated comment in btrfs_ioctl_resize() Btrfs: remove some WARN_ONs in the IO failure path Btrfs: Don't loop forever on metadata IO failures Btrfs: init inode ordered_data_close flag properly
Diffstat (limited to 'fs/btrfs/ioctl.c')
-rw-r--r--fs/btrfs/ioctl.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/fs/btrfs/ioctl.c b/fs/btrfs/ioctl.c
index 5e94ea6..2624b53 100644
--- a/fs/btrfs/ioctl.c
+++ b/fs/btrfs/ioctl.c
@@ -437,10 +437,6 @@ out_unlock:
return 0;
}
-/*
- * Called inside transaction, so use GFP_NOFS
- */
-
static int btrfs_ioctl_resize(struct btrfs_root *root, void __user *arg)
{
u64 new_size;
OpenPOWER on IntegriCloud