From 60403e2932166bcadc7397d14b1bb8149d19a986 Mon Sep 17 00:00:00 2001 From: Andi Drebes Date: Thu, 18 Oct 2007 03:06:55 -0700 Subject: [PATCH] --- yaml --- r: 71216 b: refs/heads/master c: 4176ed593866b5e4bcf86896e0734315ad46661b h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/fs/cramfs/inode.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 38c6126a710b..6ac7d018b91f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6bbfb0776615b3cb84ccfec8f5d6214938143b2a +refs/heads/master: 4176ed593866b5e4bcf86896e0734315ad46661b diff --git a/trunk/fs/cramfs/inode.c b/trunk/fs/cramfs/inode.c index 7f76abbe945f..350680fd7da7 100644 --- a/trunk/fs/cramfs/inode.c +++ b/trunk/fs/cramfs/inode.c @@ -361,7 +361,7 @@ static int cramfs_readdir(struct file *filp, void *dirent, filldir_t filldir) if (offset & 3) return -EINVAL; - buf = kmalloc(256, GFP_KERNEL); + buf = kmalloc(CRAMFS_MAXPATHLEN, GFP_KERNEL); if (!buf) return -ENOMEM; @@ -375,7 +375,7 @@ static int cramfs_readdir(struct file *filp, void *dirent, filldir_t filldir) int namelen, error; mutex_lock(&read_mutex); - de = cramfs_read(sb, OFFSET(inode) + offset, sizeof(*de)+256); + de = cramfs_read(sb, OFFSET(inode) + offset, sizeof(*de)+CRAMFS_MAXPATHLEN); name = (char *)(de+1); /* @@ -425,7 +425,7 @@ static struct dentry * cramfs_lookup(struct inode *dir, struct dentry *dentry, s char *name; int namelen, retval; - de = cramfs_read(dir->i_sb, OFFSET(dir) + offset, sizeof(*de)+256); + de = cramfs_read(dir->i_sb, OFFSET(dir) + offset, sizeof(*de)+CRAMFS_MAXPATHLEN); name = (char *)(de+1); /* Try to take advantage of sorted directories */