diff options
| author | Steve French <sfrench@us.ibm.com> | 2008-04-24 11:26:50 -0400 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2008-04-24 11:26:50 -0400 |
| commit | 36d99df2fb474222ab47fbe8ae7385661033223b (patch) | |
| tree | 962e068491b752a944f61c454fad3f8619a1ea3f /fs/gfs2/locking/nolock/main.c | |
| parent | 076d8423a98659a92837b07aa494cb74bfefe77c (diff) | |
| parent | 3dc5063786b273f1aee545844f6bd4e9651ebffe (diff) | |
Merge branch 'master' of /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 d3b8ce6fbbe3..284a5ece8d94 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) | |||
| 140 | struct nolock_lockspace *nl = lock; | 140 | struct nolock_lockspace *nl = lock; |
| 141 | int error = 0; | 141 | int error = 0; |
| 142 | 142 | ||
| 143 | *lvbp = kzalloc(nl->nl_lvb_size, GFP_KERNEL); | 143 | *lvbp = kzalloc(nl->nl_lvb_size, GFP_NOFS); |
| 144 | if (!*lvbp) | 144 | if (!*lvbp) |
| 145 | error = -ENOMEM; | 145 | error = -ENOMEM; |
| 146 | 146 | ||