diff options
author | Kurt Hackel <kurt.hackel@oracle.com> | 2006-05-01 17:25:21 -0400 |
---|---|---|
committer | Mark Fasheh <mark.fasheh@oracle.com> | 2006-06-26 17:43:12 -0400 |
commit | ad8100e0d20e0123def9f83c040b68c96c8638f0 (patch) | |
tree | 67488f9e1ad5cb9dc0eee3b59df760ddf8f1e0ff /fs/ocfs2/dlm/dlmrecovery.c | |
parent | b7084ab538ac2bd71ce494cf1cbbea9fe9db2c07 (diff) |
ocfs2: use GFP_NOFS in some dlm operations
Signed-off-by: Kurt Hackel <kurt.hackel@oracle.com>
Signed-off-by: Mark Fasheh <mark.fasheh@oracle.com>
Diffstat (limited to 'fs/ocfs2/dlm/dlmrecovery.c')
-rw-r--r-- | fs/ocfs2/dlm/dlmrecovery.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/fs/ocfs2/dlm/dlmrecovery.c b/fs/ocfs2/dlm/dlmrecovery.c index b03fecab299d..f76b498a1745 100644 --- a/fs/ocfs2/dlm/dlmrecovery.c +++ b/fs/ocfs2/dlm/dlmrecovery.c | |||
@@ -737,7 +737,7 @@ static int dlm_init_recovery_area(struct dlm_ctxt *dlm, u8 dead_node) | |||
737 | } | 737 | } |
738 | BUG_ON(num == dead_node); | 738 | BUG_ON(num == dead_node); |
739 | 739 | ||
740 | ndata = kcalloc(1, sizeof(*ndata), GFP_KERNEL); | 740 | ndata = kcalloc(1, sizeof(*ndata), GFP_NOFS); |
741 | if (!ndata) { | 741 | if (!ndata) { |
742 | dlm_destroy_recovery_area(dlm, dead_node); | 742 | dlm_destroy_recovery_area(dlm, dead_node); |
743 | return -ENOMEM; | 743 | return -ENOMEM; |
@@ -822,14 +822,14 @@ int dlm_request_all_locks_handler(struct o2net_msg *msg, u32 len, void *data) | |||
822 | } | 822 | } |
823 | BUG_ON(lr->dead_node != dlm->reco.dead_node); | 823 | BUG_ON(lr->dead_node != dlm->reco.dead_node); |
824 | 824 | ||
825 | item = kcalloc(1, sizeof(*item), GFP_KERNEL); | 825 | item = kcalloc(1, sizeof(*item), GFP_NOFS); |
826 | if (!item) { | 826 | if (!item) { |
827 | dlm_put(dlm); | 827 | dlm_put(dlm); |
828 | return -ENOMEM; | 828 | return -ENOMEM; |
829 | } | 829 | } |
830 | 830 | ||
831 | /* this will get freed by dlm_request_all_locks_worker */ | 831 | /* this will get freed by dlm_request_all_locks_worker */ |
832 | buf = (char *) __get_free_page(GFP_KERNEL); | 832 | buf = (char *) __get_free_page(GFP_NOFS); |
833 | if (!buf) { | 833 | if (!buf) { |
834 | kfree(item); | 834 | kfree(item); |
835 | dlm_put(dlm); | 835 | dlm_put(dlm); |
@@ -1302,8 +1302,8 @@ int dlm_mig_lockres_handler(struct o2net_msg *msg, u32 len, void *data) | |||
1302 | mlog(0, "all done flag. all lockres data received!\n"); | 1302 | mlog(0, "all done flag. all lockres data received!\n"); |
1303 | 1303 | ||
1304 | ret = -ENOMEM; | 1304 | ret = -ENOMEM; |
1305 | buf = kmalloc(be16_to_cpu(msg->data_len), GFP_KERNEL); | 1305 | buf = kmalloc(be16_to_cpu(msg->data_len), GFP_NOFS); |
1306 | item = kcalloc(1, sizeof(*item), GFP_KERNEL); | 1306 | item = kcalloc(1, sizeof(*item), GFP_NOFS); |
1307 | if (!buf || !item) | 1307 | if (!buf || !item) |
1308 | goto leave; | 1308 | goto leave; |
1309 | 1309 | ||