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
- unland b_fid to HEAD
[fs/lustre-release.git]
/
lustre
/
mds
/
mds_lmv.c
diff --git
a/lustre/mds/mds_lmv.c
b/lustre/mds/mds_lmv.c
index
0500bfe
..
df80c75
100644
(file)
--- a/
lustre/mds/mds_lmv.c
+++ b/
lustre/mds/mds_lmv.c
@@
-238,7
+238,7
@@
static int dc_new_page_to_cache(struct dir_cache * dirc)
page = alloc_page(GFP_KERNEL);
if (page == NULL)
return -ENOMEM;
page = alloc_page(GFP_KERNEL);
if (page == NULL)
return -ENOMEM;
- list_add_tail(&page->l
ist
, &dirc->list);
+ list_add_tail(&page->l
ru
, &dirc->list);
dirc->cur = page_address(page);
dirc->free = PAGE_SIZE;
return 0;
dirc->cur = page_address(page);
dirc->free = PAGE_SIZE;
return 0;
@@
-301,13
+301,13
@@
static int flush_buffer_onto_mds(struct dirsplit_control *dc, int mdsnum)
list_for_each_safe(cur, tmp, &ca->list) {
struct page *page;
list_for_each_safe(cur, tmp, &ca->list) {
struct page *page;
- page = list_entry(cur, struct page, l
ist
);
+ page = list_entry(cur, struct page, l
ru
);
LASSERT(page != NULL);
retrieve_generation_numbers(dc, page_address(page));
ca->brwc.pg = page;
LASSERT(page != NULL);
retrieve_generation_numbers(dc, page_address(page));
ca->brwc.pg = page;
- ca->brwc.
off
= 0;
+ ca->brwc.
disk_offset = ca->brwc.page_offset
= 0;
ca->brwc.count = PAGE_SIZE;
ca->brwc.flag = 0;
ca->oa.o_mds = mdsnum;
ca->brwc.count = PAGE_SIZE;
ca->brwc.flag = 0;
ca->oa.o_mds = mdsnum;
@@
-334,7
+334,7
@@
static int remove_entries_from_orig_dir(struct dirsplit_control *dc, int mdsnum)
ca = dc->cache + mdsnum;
list_for_each_safe(cur, tmp, &ca->list) {
ca = dc->cache + mdsnum;
list_for_each_safe(cur, tmp, &ca->list) {
- page = list_entry(cur, struct page, l
ist
);
+ page = list_entry(cur, struct page, l
ru
);
buf = page_address(page);
end = buf + PAGE_SIZE;
buf = page_address(page);
end = buf + PAGE_SIZE;
@@
-478,8
+478,8
@@
cleanup:
continue;
list_for_each_safe(cur, tmp, &dc.cache[i].list) {
struct page *page;
continue;
list_for_each_safe(cur, tmp, &dc.cache[i].list) {
struct page *page;
- page = list_entry(cur, struct page, l
ist
);
- list_del(&page->l
ist
);
+ page = list_entry(cur, struct page, l
ru
);
+ list_del(&page->l
ru
);
__free_page(page);
}
}
__free_page(page);
}
}