From a043ac206d6db3a02bd9b2e318d14aea29d1dbde Mon Sep 17 00:00:00 2001 From: Miao Xie Date: Thu, 24 Mar 2011 11:41:21 +0000 Subject: [PATCH] --- yaml --- r: 243167 b: refs/heads/master c: fc0e4a314e361af3b13d9320e92c64118f9a3e61 h: refs/heads/master i: 243165: 734f27747bad870536015492646b3f6047cc9636 243163: ffef12e1baf05f97f5382a9b044b2bd290cfeb26 243159: ae74f7d06f1be81ae275eb05c8707a06b05671d5 243151: e1e98f06df0e4f08b6f1b32aa68bd6cf428560aa 243135: 3134de014e97d735d12f1fc4cb0017d5868b1bef v: v3 --- [refs] | 2 +- trunk/fs/btrfs/extent-tree.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 3df806caccb9..8a9e2c078fec 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 97d9a8a420444eb5b5c071d4b3b9c4100a7ae015 +refs/heads/master: fc0e4a314e361af3b13d9320e92c64118f9a3e61 diff --git a/trunk/fs/btrfs/extent-tree.c b/trunk/fs/btrfs/extent-tree.c index 5bc658a9d85c..7922f296420d 100644 --- a/trunk/fs/btrfs/extent-tree.c +++ b/trunk/fs/btrfs/extent-tree.c @@ -471,7 +471,7 @@ static int cache_block_group(struct btrfs_block_group_cache *cache, if (load_cache_only) return 0; - caching_ctl = kzalloc(sizeof(*caching_ctl), GFP_KERNEL); + caching_ctl = kzalloc(sizeof(*caching_ctl), GFP_NOFS); BUG_ON(!caching_ctl); INIT_LIST_HEAD(&caching_ctl->list); @@ -1743,7 +1743,7 @@ static int remove_extent_backref(struct btrfs_trans_handle *trans, static void btrfs_issue_discard(struct block_device *bdev, u64 start, u64 len) { - blkdev_issue_discard(bdev, start >> 9, len >> 9, GFP_KERNEL, 0); + blkdev_issue_discard(bdev, start >> 9, len >> 9, GFP_NOFS, 0); } static int btrfs_discard_extent(struct btrfs_root *root, u64 bytenr,