summaryrefslogtreecommitdiff
path: root/fs
diff options
context:
space:
mode:
authorFrederic Weisbecker <fweisbec@gmail.com>2009-11-20 04:11:30 +0100
committerFrederic Weisbecker <fweisbec@gmail.com>2009-11-20 18:25:02 +0100
commit1d2c6cfd40b2dece3bb958cbbc405a2c1536ab75 (patch)
tree52ab33b148548083ae0456857791a8d410c83a31 /fs
parent27b3a5c51b50a234fb4a21146841e6723b5934ce (diff)
downloadlinux-3.10-1d2c6cfd40b2dece3bb958cbbc405a2c1536ab75.tar.gz
linux-3.10-1d2c6cfd40b2dece3bb958cbbc405a2c1536ab75.tar.bz2
linux-3.10-1d2c6cfd40b2dece3bb958cbbc405a2c1536ab75.zip
kill-the-bkl/reiserfs: turn GFP_ATOMIC flag to GFP_NOFS in reiserfs_get_block()
GFP_ATOMIC was used in reiserfs_get_block to not lose the Bkl so that nobody can modify the tree in the middle of its work. Now that we kicked out the bkl, we can use a more friendly flag. We use GFP_NOFS here because we already hold the reiserfs lock. Signed-off-by: Frederic Weisbecker <fweisbec@gmail.com> Cc: Jeff Mahoney <jeffm@suse.com> Cc: Chris Mason <chris.mason@oracle.com> Cc: Ingo Molnar <mingo@elte.hu> Cc: Alexander Beregalov <a.beregalov@gmail.com> Cc: Laurent Riffard <laurent.riffard@free.fr> Cc: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'fs')
-rw-r--r--fs/reiserfs/inode.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/reiserfs/inode.c b/fs/reiserfs/inode.c
index 0d493a3bb74..3a28e7751b3 100644
--- a/fs/reiserfs/inode.c
+++ b/fs/reiserfs/inode.c
@@ -932,7 +932,7 @@ int reiserfs_get_block(struct inode *inode, sector_t block,
if (blocks_needed == 1) {
un = &unf_single;
} else {
- un = kzalloc(min(blocks_needed, max_to_insert) * UNFM_P_SIZE, GFP_ATOMIC); // We need to avoid scheduling.
+ un = kzalloc(min(blocks_needed, max_to_insert) * UNFM_P_SIZE, GFP_NOFS);
if (!un) {
un = &unf_single;
blocks_needed = 1;