diff options
| author | David Woodhouse <dwmw2@infradead.org> | 2008-04-22 11:34:25 (GMT) |
|---|---|---|
| committer | David Woodhouse <dwmw2@infradead.org> | 2008-04-22 11:34:25 (GMT) |
| commit | f838bad1b3be8ca0c785ee0e0c570dfda74cf377 (patch) | |
| tree | 5a842a8056a708cfad55a20fa8ab733dd94b0903 /fs/gfs2/locking/nolock/main.c | |
| parent | dd919660aacdf4adfcd279556aa03e595f7f0fc2 (diff) | |
| parent | 807501475fce0ebe68baedf87f202c3e4ee0d12c (diff) | |
| download | linux-fsl-qoriq-f838bad1b3be8ca0c785ee0e0c570dfda74cf377.tar.xz | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'fs/gfs2/locking/nolock/main.c')
| -rw-r--r-- | fs/gfs2/locking/nolock/main.c | 2 |
1 files changed, 1 insertions, 1 deletions
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; |