From: Arjan van de Ven <arjanv@redhat.com>
nfs/read.c: dynamically allocate the big structs
---
25-akpm/fs/nfs/read.c | 49 ++++++++++++++++++++++++-------------------------
1 files changed, 24 insertions(+), 25 deletions(-)
diff -puN fs/nfs/read.c~stack-reductions-nfsread fs/nfs/read.c
--- 25/fs/nfs/read.c~stack-reductions-nfsread Thu Mar 25 16:35:04 2004
+++ 25-akpm/fs/nfs/read.c Thu Mar 25 16:35:35 2004
@@ -43,7 +43,7 @@ static mempool_t *nfs_rdata_mempool;
#define MIN_POOL_READ (32)
-static __inline__ struct nfs_read_data *nfs_readdata_alloc(void)
+static struct nfs_read_data *nfs_readdata_alloc(void)
{
struct nfs_read_data *p;
p = (struct nfs_read_data *)mempool_alloc(nfs_rdata_mempool, SLAB_NOFS);
@@ -99,21 +99,19 @@ nfs_readpage_sync(struct file *file, str
unsigned int rsize = NFS_SERVER(inode)->rsize;
unsigned int count = PAGE_CACHE_SIZE;
int result;
- struct nfs_read_data rdata = {
- .flags = (IS_SWAPFILE(inode)? NFS_RPC_SWAPFLAGS : 0),
- .cred = NULL,
- .inode = inode,
- .args = {
- .fh = NFS_FH(inode),
- .lockowner = current->files,
- .pages = &page,
- .pgbase = 0UL,
- .count = rsize,
- },
- .res = {
- .fattr = &rdata.fattr,
- }
- };
+ struct nfs_read_data *rdata;
+
+ rdata = nfs_readdata_alloc();
+ if (!rdata)
+ return -ENOMEM;
+
+ rdata->flags = (IS_SWAPFILE(inode) ? NFS_RPC_SWAPFLAGS : 0);
+ rdata->inode = inode;
+ rdata->args.fh = NFS_FH(inode);
+ rdata->args.pages = &page;
+ rdata->args.count = rsize;
+ rdata->args.lockowner = current->files;
+ rdata->res.fattr = &rdata->fattr;
dprintk("NFS: nfs_readpage_sync(%p)\n", page);
@@ -123,19 +121,19 @@ nfs_readpage_sync(struct file *file, str
*/
do {
if (count < rsize)
- rdata.args.count = count;
- rdata.res.count = rdata.args.count;
- rdata.args.offset = page_offset(page) + rdata.args.pgbase;
+ rdata->args.count = count;
+ rdata->res.count = rdata->args.count;
+ rdata->args.offset = page_offset(page) + rdata->args.pgbase;
dprintk("NFS: nfs_proc_read(%s, (%s/%Ld), %Lu, %u)\n",
NFS_SERVER(inode)->hostname,
inode->i_sb->s_id,
(long long)NFS_FILEID(inode),
- (unsigned long long)rdata.args.pgbase,
- rdata.args.count);
+ (unsigned long long)rdata->args.pgbase,
+ rdata->args.count);
lock_kernel();
- result = NFS_PROTO(inode)->read(&rdata, file);
+ result = NFS_PROTO(inode)->read(rdata, file);
unlock_kernel();
/*
@@ -148,17 +146,17 @@ nfs_readpage_sync(struct file *file, str
goto io_error;
}
count -= result;
- rdata.args.pgbase += result;
+ rdata->args.pgbase += result;
/* Note: result == 0 should only happen if we're caching
* a write that extends the file and punches a hole.
*/
- if (rdata.res.eof != 0 || result == 0)
+ if (rdata->res.eof != 0 || result == 0)
break;
} while (count);
NFS_FLAGS(inode) |= NFS_INO_INVALID_ATIME;
if (count)
- memclear_highpage_flush(page, rdata.args.pgbase, count);
+ memclear_highpage_flush(page, rdata->args.pgbase, count);
SetPageUptodate(page);
if (PageError(page))
ClearPageError(page);
@@ -166,6 +164,7 @@ nfs_readpage_sync(struct file *file, str
io_error:
unlock_page(page);
+ nfs_readdata_free(rdata);
return result;
}
_