GitHub-Mirror/Star64_linux
2
0
Fork 0
mirror of https://github.com/Fishwaldo/Star64_linux.git synced 2025-06-06 14:48:06 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'cleanups' into next

Browse source
This commit is contained in:
Trond Myklebust 2008-02-28 23:48:05 -08:00
commit cdd0972945
3 changed files with 26 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
fs/nfs/write.c
View file

@ -351,15 +351,13 @@ int nfs_writepages(struct address_space *mapping, struct writeback_control *wbc)
/* /*
* Insert a write request into an inode * Insert a write request into an inode
*/ */
static int nfs_inode_add_request(struct inode *inode, struct nfs_page *req) static void nfs_inode_add_request(struct inode *inode, struct nfs_page *req)
{ {
struct nfs_inode *nfsi = NFS_I(inode); struct nfs_inode *nfsi = NFS_I(inode);
int error; int error;
error = radix_tree_insert(&nfsi->nfs_page_tree, req->wb_index, req); error = radix_tree_insert(&nfsi->nfs_page_tree, req->wb_index, req);
BUG_ON(error == -EEXIST); BUG_ON(error);
if (error)
return error;
if (!nfsi->npages) { if (!nfsi->npages) {
igrab(inode); igrab(inode);
if (nfs_have_delegation(inode, FMODE_WRITE)) if (nfs_have_delegation(inode, FMODE_WRITE))
@ -369,8 +367,8 @@ static int nfs_inode_add_request(struct inode *inode, struct nfs_page *req)
set_page_private(req->wb_page, (unsigned long)req); set_page_private(req->wb_page, (unsigned long)req);
nfsi->npages++; nfsi->npages++;
kref_get(&req->wb_kref); kref_get(&req->wb_kref);
radix_tree_tag_set(&nfsi->nfs_page_tree, req->wb_index, NFS_PAGE_TAG_LOCKED); radix_tree_tag_set(&nfsi->nfs_page_tree, req->wb_index,
return 0; NFS_PAGE_TAG_LOCKED);
} }
/* /*
@ -582,6 +580,13 @@ static struct nfs_page * nfs_update_request(struct nfs_open_context* ctx,
/* Loop over all inode entries and see if we find /* Loop over all inode entries and see if we find
* A request for the page we wish to update * A request for the page we wish to update
*/ */
if (new) {
if (radix_tree_preload(GFP_NOFS)) {
nfs_release_request(new);
return ERR_PTR(-ENOMEM);
}
}
spin_lock(&inode->i_lock); spin_lock(&inode->i_lock);
req = nfs_page_find_request_locked(page); req = nfs_page_find_request_locked(page);
if (req) { if (req) {
@ -592,28 +597,27 @@ static struct nfs_page * nfs_update_request(struct nfs_open_context* ctx,
error = nfs_wait_on_request(req); error = nfs_wait_on_request(req);
nfs_release_request(req); nfs_release_request(req);
if (error < 0) { if (error < 0) {
if (new) if (new) {
radix_tree_preload_end();
nfs_release_request(new); nfs_release_request(new);
}
return ERR_PTR(error); return ERR_PTR(error);
} }
continue; continue;
} }
spin_unlock(&inode->i_lock); spin_unlock(&inode->i_lock);
if (new) if (new) {
radix_tree_preload_end();
nfs_release_request(new); nfs_release_request(new);
}
break; break;
} }
if (new) { if (new) {
int error;
nfs_lock_request_dontget(new); nfs_lock_request_dontget(new);
error = nfs_inode_add_request(inode, new); nfs_inode_add_request(inode, new);
if (error) {
spin_unlock(&inode->i_lock);
nfs_unlock_request(new);
return ERR_PTR(error);
}
spin_unlock(&inode->i_lock); spin_unlock(&inode->i_lock);
radix_tree_preload_end();
req = new; req = new;
goto zero_page; goto zero_page;
} }

9
include/linux/sunrpc/clnt.h
View file

@ -127,11 +127,12 @@ int rpcb_getport_sync(struct sockaddr_in *, u32, u32, int);
void rpcb_getport_async(struct rpc_task *); void rpcb_getport_async(struct rpc_task *);
void rpc_call_start(struct rpc_task *); void rpc_call_start(struct rpc_task *);
int rpc_call_async(struct rpc_clnt *clnt, struct rpc_message *msg, int rpc_call_async(struct rpc_clnt *clnt,
int flags, const struct rpc_call_ops *tk_ops, const struct rpc_message *msg, int flags,
const struct rpc_call_ops *tk_ops,
void *calldata); void *calldata);
int rpc_call_sync(struct rpc_clnt *clnt, struct rpc_message *msg, int rpc_call_sync(struct rpc_clnt *clnt,
int flags); const struct rpc_message *msg, int flags);
struct rpc_task *rpc_call_null(struct rpc_clnt *clnt, struct rpc_cred *cred, struct rpc_task *rpc_call_null(struct rpc_clnt *clnt, struct rpc_cred *cred,
int flags); int flags);
void rpc_restart_call(struct rpc_task *); void rpc_restart_call(struct rpc_task *);

4
net/sunrpc/clnt.c
View file

@ -548,7 +548,7 @@ EXPORT_SYMBOL_GPL(rpc_run_task);
* @msg: RPC call parameters * @msg: RPC call parameters
* @flags: RPC call flags * @flags: RPC call flags
*/ */
int rpc_call_sync(struct rpc_clnt *clnt, struct rpc_message *msg, int flags) int rpc_call_sync(struct rpc_clnt *clnt, const struct rpc_message *msg, int flags)
{ {
struct rpc_task *task; struct rpc_task *task;
struct rpc_task_setup task_setup_data = { struct rpc_task_setup task_setup_data = {
@ -579,7 +579,7 @@ EXPORT_SYMBOL_GPL(rpc_call_sync);
* @data: user call data * @data: user call data
*/ */
int int
rpc_call_async(struct rpc_clnt *clnt, struct rpc_message *msg, int flags, rpc_call_async(struct rpc_clnt *clnt, const struct rpc_message *msg, int flags,
const struct rpc_call_ops *tk_ops, void *data) const struct rpc_call_ops *tk_ops, void *data)
{ {
struct rpc_task *task; struct rpc_task *task;