diff --git a/[refs] b/[refs]
index fde2d058dcaa..3aa9892e9d12 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e1df36d2f18254d0690a0fbe036cece74ec311b8
+refs/heads/master: b335b0034e252e79ec2e9c6697f5d663c4627bec
diff --git a/trunk/fs/btrfs/inode.c b/trunk/fs/btrfs/inode.c
index 8f0706210a47..638bcb5e49f6 100644
--- a/trunk/fs/btrfs/inode.c
+++ b/trunk/fs/btrfs/inode.c
@@ -4263,7 +4263,7 @@ static int btrfs_releasepage(struct page *page, gfp_t gfp_flags)
 {
 	if (PageWriteback(page) || PageDirty(page))
 		return 0;
-	return __btrfs_releasepage(page, gfp_flags);
+	return __btrfs_releasepage(page, gfp_flags & GFP_NOFS);
 }
 
 static void btrfs_invalidatepage(struct page *page, unsigned long offset)