diff --git a/[refs] b/[refs]
index 6fc2b5618f1c..1dbeed0f3301 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cc7b0c9b701a079016183f3546b4d720194b367f
+refs/heads/master: 5d847a8ed970d17e2734ff9e07a74fe36cceb24e
diff --git a/trunk/fs/btrfs/ioctl.c b/trunk/fs/btrfs/ioctl.c
index 48762aa1e945..db84aa48ab7a 100644
--- a/trunk/fs/btrfs/ioctl.c
+++ b/trunk/fs/btrfs/ioctl.c
@@ -437,10 +437,6 @@ static int btrfs_defrag_file(struct file *file)
 	return 0;
 }
 
-/*
- * Called inside transaction, so use GFP_NOFS
- */
-
 static int btrfs_ioctl_resize(struct btrfs_root *root, void __user *arg)
 {
 	u64 new_size;