diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-02-02 12:48:26 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-02-02 12:48:26 -0800 |
| commit | 4dab75ec3ebf28583fc902ac946b287b5acdbcad (patch) | |
| tree | 0f4d8c7b42bdf9f904a87c5ff13fb42e2ad43038 | |
| parent | 7fbcca25c0bf8679a751034f65428ff6291cd4ca (diff) | |
| parent | ea8d62dadd0217334fb2c5d60e7f89e14076ca10 (diff) | |
| download | kernel_samsung_crespo-4dab75ec3ebf28583fc902ac946b287b5acdbcad.zip kernel_samsung_crespo-4dab75ec3ebf28583fc902ac946b287b5acdbcad.tar.gz kernel_samsung_crespo-4dab75ec3ebf28583fc902ac946b287b5acdbcad.tar.bz2 | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-fixes
* git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-fixes:
GFS2: Use GFP_NOFS for alloc structure
GFS2: Fix previous patch
GFS2: Don't withdraw on partial rindex entries
GFS2: Fix refcnt leak on gfs2_follow_link() error path
| -rw-r--r-- | fs/gfs2/ops_inode.c | 3 | ||||
| -rw-r--r-- | fs/gfs2/rgrp.c | 8 |
2 files changed, 4 insertions, 7 deletions
diff --git a/fs/gfs2/ops_inode.c b/fs/gfs2/ops_inode.c index 78f73ca..84350e1 100644 --- a/fs/gfs2/ops_inode.c +++ b/fs/gfs2/ops_inode.c @@ -1088,7 +1088,8 @@ static void *gfs2_follow_link(struct dentry *dentry, struct nameidata *nd) error = vfs_follow_link(nd, buf); if (buf != array) kfree(buf); - } + } else + path_put(&nd->path); return ERR_PTR(error); } diff --git a/fs/gfs2/rgrp.c b/fs/gfs2/rgrp.c index 0608f49..503b842 100644 --- a/fs/gfs2/rgrp.c +++ b/fs/gfs2/rgrp.c @@ -591,11 +591,7 @@ static int gfs2_ri_update(struct gfs2_inode *ip) u64 rgrp_count = ip->i_disksize; int error; - if (do_div(rgrp_count, sizeof(struct gfs2_rindex))) { - gfs2_consist_inode(ip); - return -EIO; - } - + do_div(rgrp_count, sizeof(struct gfs2_rindex)); clear_rgrpdi(sdp); file_ra_state_init(&ra_state, inode->i_mapping); @@ -915,7 +911,7 @@ void gfs2_rgrp_repolish_clones(struct gfs2_rgrpd *rgd) struct gfs2_alloc *gfs2_alloc_get(struct gfs2_inode *ip) { BUG_ON(ip->i_alloc != NULL); - ip->i_alloc = kzalloc(sizeof(struct gfs2_alloc), GFP_KERNEL); + ip->i_alloc = kzalloc(sizeof(struct gfs2_alloc), GFP_NOFS); return ip->i_alloc; } |