diff options
author | Steven Whitehouse <swhiteho@redhat.com> | 2006-04-18 10:09:15 -0400 |
---|---|---|
committer | Steven Whitehouse <swhiteho@redhat.com> | 2006-04-18 10:09:15 -0400 |
commit | fe1bdedc6c16adedc6fd3636185ea91596b1d6eb (patch) | |
tree | 4d68a40c1a2db670e71952003e5fb09a95123975 /fs/gfs2/ops_inode.c | |
parent | 4d8012b60e0f0e0217e65f67da7d97276d1824e9 (diff) | |
download | linux-fe1bdedc6c16adedc6fd3636185ea91596b1d6eb.tar.gz linux-fe1bdedc6c16adedc6fd3636185ea91596b1d6eb.tar.bz2 linux-fe1bdedc6c16adedc6fd3636185ea91596b1d6eb.zip |
[GFS2] Use vmalloc() in dir code
When allocating memory to sort directory entries, use vmalloc()
rather than kmalloc() since for larger directories, the required
size can easily be graeter than the 128k maximum of kmalloc().
Also adding the first steps towards getting the AOP_TRUNCATED_PAGE
return code get in the glock code by flagging all places where we
request a glock and we are holding a page lock.
Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
Diffstat (limited to 'fs/gfs2/ops_inode.c')
-rw-r--r-- | fs/gfs2/ops_inode.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/fs/gfs2/ops_inode.c b/fs/gfs2/ops_inode.c index 1e2b709711ae..62a12a59d91b 100644 --- a/fs/gfs2/ops_inode.c +++ b/fs/gfs2/ops_inode.c @@ -742,8 +742,7 @@ static int gfs2_rename(struct inode *odir, struct dentry *odentry, if (error) goto out_gunlock_q; - error = gfs2_trans_begin(sdp, - sdp->sd_max_dirres + + error = gfs2_trans_begin(sdp, sdp->sd_max_dirres + al->al_rgd->rd_ri.ri_length + 4 * RES_DINODE + 4 * RES_LEAF + RES_UNLINKED + RES_STATFS + |