git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fs/ceph: Use ERR_CAST
[safe/jmp/linux-2.6]
/
fs
/
ceph
/
file.c
diff --git
a/fs/ceph/file.c
b/fs/ceph/file.c
index
834d2b8
..
f06f902
100644
(file)
--- a/
fs/ceph/file.c
+++ b/
fs/ceph/file.c
@@
-230,7
+230,7
@@
struct dentry *ceph_lookup_open(struct inode *dir, struct dentry *dentry,
/* do the open */
req = prepare_open_request(dir->i_sb, flags, mode);
if (IS_ERR(req))
/* do the open */
req = prepare_open_request(dir->i_sb, flags, mode);
if (IS_ERR(req))
- return ERR_
PTR(PTR_ERR(req)
);
+ return ERR_
CAST(req
);
req->r_dentry = dget(dentry);
req->r_num_caps = 2;
if (flags & O_CREAT) {
req->r_dentry = dget(dentry);
req->r_num_caps = 2;
if (flags & O_CREAT) {
@@
-317,16
+317,16
@@
void ceph_release_page_vector(struct page **pages, int num_pages)
/*
* allocate a vector new pages
*/
/*
* allocate a vector new pages
*/
-st
atic struct page **alloc_page_vector(int num_page
s)
+st
ruct page **ceph_alloc_page_vector(int num_pages, gfp_t flag
s)
{
struct page **pages;
int i;
{
struct page **pages;
int i;
- pages = kmalloc(sizeof(*pages) * num_pages,
GFP_NOFS
);
+ pages = kmalloc(sizeof(*pages) * num_pages,
flags
);
if (!pages)
return ERR_PTR(-ENOMEM);
for (i = 0; i < num_pages; i++) {
if (!pages)
return ERR_PTR(-ENOMEM);
for (i = 0; i < num_pages; i++) {
- pages[i] = __page_cache_alloc(
GFP_NOFS
);
+ pages[i] = __page_cache_alloc(
flags
);
if (pages[i] == NULL) {
ceph_release_page_vector(pages, i);
return ERR_PTR(-ENOMEM);
if (pages[i] == NULL) {
ceph_release_page_vector(pages, i);
return ERR_PTR(-ENOMEM);
@@
-540,7
+540,7
@@
static ssize_t ceph_sync_read(struct file *file, char __user *data,
* in sequence.
*/
} else {
* in sequence.
*/
} else {
- pages =
alloc_page_vector(num_pages
);
+ pages =
ceph_alloc_page_vector(num_pages, GFP_NOFS
);
}
if (IS_ERR(pages))
return PTR_ERR(pages);
}
if (IS_ERR(pages))
return PTR_ERR(pages);
@@
-649,8
+649,8
@@
more:
do_sync,
ci->i_truncate_seq, ci->i_truncate_size,
&mtime, false, 2);
do_sync,
ci->i_truncate_seq, ci->i_truncate_size,
&mtime, false, 2);
- if (
IS_ERR(req)
)
- return
PTR_ERR(req)
;
+ if (
!req
)
+ return
-ENOMEM
;
num_pages = calc_pages_for(pos, len);
num_pages = calc_pages_for(pos, len);
@@
-668,7
+668,7
@@
more:
truncate_inode_pages_range(inode->i_mapping, pos,
(pos+len) | (PAGE_CACHE_SIZE-1));
} else {
truncate_inode_pages_range(inode->i_mapping, pos,
(pos+len) | (PAGE_CACHE_SIZE-1));
} else {
- pages =
alloc_page_vector(num_pages
);
+ pages =
ceph_alloc_page_vector(num_pages, GFP_NOFS
);
if (IS_ERR(pages)) {
ret = PTR_ERR(pages);
goto out;
if (IS_ERR(pages)) {
ret = PTR_ERR(pages);
goto out;