From 332c6ad7ed9481c44d07465fc6da72c080075685 Mon Sep 17 00:00:00 2001
From: Li Hong <lihong.hi@gmail.com>
Date: Thu, 14 May 2009 13:52:21 -0400
Subject: [PATCH] --- yaml --- r: 144929 b: refs/heads/master c:
 5d847a8ed970d17e2734ff9e07a74fe36cceb24e h: refs/heads/master i:   144927:
 0fe1c68e803d575baf26398feee016a490fbc7da v: v3

---
 [refs]                 | 2 +-
 trunk/fs/btrfs/ioctl.c | 4 ----
 2 files changed, 1 insertion(+), 5 deletions(-)

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;