ext2: Fix oops in ext2_get_block() called from ext2_quota_write()

[pandora-kernel.git] / fs / ocfs2 / symlink.c

diff --git a/fs/ocfs2/symlink.c b/fs/ocfs2/symlink.c
index 9975457..5d22872 100644 (file)
--- a/fs/ocfs2/symlink.c
+++ b/fs/ocfs2/symlink.c
@@ -40,7 +40,6 @@
 #include <linux/pagemap.h>
 #include <linux/namei.h>
 
-#define MLOG_MASK_PREFIX ML_NAMEI
 #include <cluster/masklog.h>
 
 #include "ocfs2.h"
@@ -62,8 +61,6 @@ static char *ocfs2_fast_symlink_getlink(struct inode *inode,
        char *link = NULL;
        struct ocfs2_dinode *fe;
 
-       mlog_entry_void();
-
        status = ocfs2_read_inode_block(inode, bh);
        if (status < 0) {
                mlog_errno(status);
@@ -74,7 +71,6 @@ static char *ocfs2_fast_symlink_getlink(struct inode *inode,
        fe = (struct ocfs2_dinode *) (*bh)->b_data;
        link = (char *) fe->id2.i_symlink;
 bail:
-       mlog_exit(status);
 
        return link;
 }
@@ -88,8 +84,6 @@ static int ocfs2_readlink(struct dentry *dentry,
        struct buffer_head *bh = NULL;
        struct inode *inode = dentry->d_inode;
 
-       mlog_entry_void();
-
        link = ocfs2_fast_symlink_getlink(inode, &bh);
        if (IS_ERR(link)) {
                ret = PTR_ERR(link);
@@ -104,7 +98,8 @@ static int ocfs2_readlink(struct dentry *dentry,
 
        brelse(bh);
 out:
-       mlog_exit(ret);
+       if (ret < 0)
+               mlog_errno(ret);
        return ret;
 }
 
@@ -117,8 +112,6 @@ static void *ocfs2_fast_follow_link(struct dentry *dentry,
        struct inode *inode = dentry->d_inode;
        struct buffer_head *bh = NULL;
 
-       mlog_entry_void();
-
        BUG_ON(!ocfs2_inode_is_fast_symlink(inode));
        target = ocfs2_fast_symlink_getlink(inode, &bh);
        if (IS_ERR(target)) {
@@ -142,7 +135,8 @@ bail:
        nd_set_link(nd, status ? ERR_PTR(status) : link);
        brelse(bh);
 
-       mlog_exit(status);
+       if (status)
+               mlog_errno(status);
        return NULL;
 }