projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-cifs' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
[linux-2.6-block.git]
/
fs
/
cifs
/
cifssmb.c
diff --git
a/fs/cifs/cifssmb.c
b/fs/cifs/cifssmb.c
index f24a89c5a518d6187cd9effdeb807df15dbdfa37..145c03e75ee49c13ce8512e950cff076837c0c7f 100644
(file)
--- a/
fs/cifs/cifssmb.c
+++ b/
fs/cifs/cifssmb.c
@@
-1929,17
+1929,17
@@
cifs_writev_requeue(struct cifs_writedata *wdata)
wsize = server->ops->wp_retry_size(inode);
if (wsize < rest_len) {
wsize = server->ops->wp_retry_size(inode);
if (wsize < rest_len) {
- nr_pages = wsize / PAGE_
CACHE_
SIZE;
+ nr_pages = wsize / PAGE_SIZE;
if (!nr_pages) {
rc = -ENOTSUPP;
break;
}
if (!nr_pages) {
rc = -ENOTSUPP;
break;
}
- cur_len = nr_pages * PAGE_
CACHE_
SIZE;
- tailsz = PAGE_
CACHE_
SIZE;
+ cur_len = nr_pages * PAGE_SIZE;
+ tailsz = PAGE_SIZE;
} else {
} else {
- nr_pages = DIV_ROUND_UP(rest_len, PAGE_
CACHE_
SIZE);
+ nr_pages = DIV_ROUND_UP(rest_len, PAGE_SIZE);
cur_len = rest_len;
cur_len = rest_len;
- tailsz = rest_len - (nr_pages - 1) * PAGE_
CACHE_
SIZE;
+ tailsz = rest_len - (nr_pages - 1) * PAGE_SIZE;
}
wdata2 = cifs_writedata_alloc(nr_pages, cifs_writev_complete);
}
wdata2 = cifs_writedata_alloc(nr_pages, cifs_writev_complete);
@@
-1957,7
+1957,7
@@
cifs_writev_requeue(struct cifs_writedata *wdata)
wdata2->sync_mode = wdata->sync_mode;
wdata2->nr_pages = nr_pages;
wdata2->offset = page_offset(wdata2->pages[0]);
wdata2->sync_mode = wdata->sync_mode;
wdata2->nr_pages = nr_pages;
wdata2->offset = page_offset(wdata2->pages[0]);
- wdata2->pagesz = PAGE_
CACHE_
SIZE;
+ wdata2->pagesz = PAGE_SIZE;
wdata2->tailsz = tailsz;
wdata2->bytes = cur_len;
wdata2->tailsz = tailsz;
wdata2->bytes = cur_len;
@@
-1975,7
+1975,7
@@
cifs_writev_requeue(struct cifs_writedata *wdata)
if (rc != 0 && rc != -EAGAIN) {
SetPageError(wdata2->pages[j]);
end_page_writeback(wdata2->pages[j]);
if (rc != 0 && rc != -EAGAIN) {
SetPageError(wdata2->pages[j]);
end_page_writeback(wdata2->pages[j]);
- p
age_cache_releas
e(wdata2->pages[j]);
+ p
ut_pag
e(wdata2->pages[j]);
}
}
}
}
@@
-2018,7
+2018,7
@@
cifs_writev_complete(struct work_struct *work)
else if (wdata->result < 0)
SetPageError(page);
end_page_writeback(page);
else if (wdata->result < 0)
SetPageError(page);
end_page_writeback(page);
- p
age_cache_releas
e(page);
+ p
ut_pag
e(page);
}
if (wdata->result != -EAGAIN)
mapping_set_error(inode->i_mapping, wdata->result);
}
if (wdata->result != -EAGAIN)
mapping_set_error(inode->i_mapping, wdata->result);