Whamcloud - gitweb
git://git.whamcloud.com
/
fs
/
lustre-release.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
LU-911 osd: OI is implemented internally within OSD
[fs/lustre-release.git]
/
lustre
/
obdclass
/
llog_ioctl.c
diff --git
a/lustre/obdclass/llog_ioctl.c
b/lustre/obdclass/llog_ioctl.c
index
601bc42
..
aa91695
100644
(file)
--- a/
lustre/obdclass/llog_ioctl.c
+++ b/
lustre/obdclass/llog_ioctl.c
@@
-28,6
+28,8
@@
/*
* Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
* Use is subject to license terms.
/*
* Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
* Use is subject to license terms.
+ *
+ * Copyright (c) 2011, Whamcloud, Inc.
*/
/*
* This file is part of Lustre, http://www.lustre.org/
*/
/*
* This file is part of Lustre, http://www.lustre.org/
@@
-433,7
+435,7
@@
int llog_catalog_list(struct obd_device *obd, int count,
ENTRY;
size = sizeof(*idarray) * count;
ENTRY;
size = sizeof(*idarray) * count;
- OBD_
VMALLOC
(idarray, size);
+ OBD_
ALLOC_LARGE
(idarray, size);
if (!idarray)
RETURN(-ENOMEM);
if (!idarray)
RETURN(-ENOMEM);
@@
-460,7
+462,7
@@
out:
/* release semaphore */
cfs_mutex_up(&obd->obd_olg.olg_cat_processing);
/* release semaphore */
cfs_mutex_up(&obd->obd_olg.olg_cat_processing);
- OBD_
VFRE
E(idarray, size);
+ OBD_
FREE_LARG
E(idarray, size);
RETURN(rc);
}
RETURN(rc);
}