Merge branch 'mlog_replace_for_39' of git://repo.or.cz/taoma-kernel into ocfs2-merge-window-fix
This commit is contained in:
@@ -9,7 +9,6 @@
|
||||
#include <linux/mount.h>
|
||||
#include <linux/compat.h>
|
||||
|
||||
#define MLOG_MASK_PREFIX ML_INODE
|
||||
#include <cluster/masklog.h>
|
||||
|
||||
#include "ocfs2.h"
|
||||
@@ -75,7 +74,6 @@ static int ocfs2_get_inode_attr(struct inode *inode, unsigned *flags)
|
||||
*flags = OCFS2_I(inode)->ip_attr;
|
||||
ocfs2_inode_unlock(inode, 0);
|
||||
|
||||
mlog_exit(status);
|
||||
return status;
|
||||
}
|
||||
|
||||
@@ -141,7 +139,6 @@ bail:
|
||||
|
||||
brelse(bh);
|
||||
|
||||
mlog_exit(status);
|
||||
return status;
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user