diff options
| author | Josef Bacik <jbacik@redhat.com> | 2008-04-09 09:33:41 -0400 |
|---|---|---|
| committer | Steven Whitehouse <swhiteho@redhat.com> | 2008-04-10 09:55:26 +0100 |
| commit | 16c5f06f15ad4e5a5d6e90b78ffb1ac14319e445 (patch) | |
| tree | 84204e44e0246e9a3f4db23223a5209105fde368 /fs/gfs2/locking | |
| parent | 773adff8e983cba1f5844c3be3be224ca6645f26 (diff) | |
| download | op-kernel-dev-16c5f06f15ad4e5a5d6e90b78ffb1ac14319e445.zip op-kernel-dev-16c5f06f15ad4e5a5d6e90b78ffb1ac14319e445.tar.gz | |
[GFS2] fix GFP_KERNEL misuses
There are several places where GFP_KERNEL allocations happen under a glock,
which will result in hangs if we're under memory pressure and go to re-enter the
fs in order to flush stuff out. This patch changes the culprits to GFS_NOFS to
keep this problem from happening. Thank you,
Signed-off-by: Josef Bacik <jbacik@redhat.com>
Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
Diffstat (limited to 'fs/gfs2/locking')
| -rw-r--r-- | fs/gfs2/locking/dlm/lock.c | 4 | ||||
| -rw-r--r-- | fs/gfs2/locking/nolock/main.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/fs/gfs2/locking/dlm/lock.c b/fs/gfs2/locking/dlm/lock.c index 53a6ab3..cf7ea8a 100644 --- a/fs/gfs2/locking/dlm/lock.c +++ b/fs/gfs2/locking/dlm/lock.c @@ -165,7 +165,7 @@ static int gdlm_create_lp(struct gdlm_ls *ls, struct lm_lockname *name, { struct gdlm_lock *lp; - lp = kzalloc(sizeof(struct gdlm_lock), GFP_KERNEL); + lp = kzalloc(sizeof(struct gdlm_lock), GFP_NOFS); if (!lp) return -ENOMEM; @@ -383,7 +383,7 @@ static int gdlm_add_lvb(struct gdlm_lock *lp) { char *lvb; - lvb = kzalloc(GDLM_LVB_SIZE, GFP_KERNEL); + lvb = kzalloc(GDLM_LVB_SIZE, GFP_NOFS); if (!lvb) return -ENOMEM; diff --git a/fs/gfs2/locking/nolock/main.c b/fs/gfs2/locking/nolock/main.c index d3b8ce6..284a5ec 100644 --- a/fs/gfs2/locking/nolock/main.c +++ b/fs/gfs2/locking/nolock/main.c @@ -140,7 +140,7 @@ static int nolock_hold_lvb(void *lock, char **lvbp) struct nolock_lockspace *nl = lock; int error = 0; - *lvbp = kzalloc(nl->nl_lvb_size, GFP_KERNEL); + *lvbp = kzalloc(nl->nl_lvb_size, GFP_NOFS); if (!*lvbp) error = -ENOMEM; |
