ocfs2 fixes
PATCH 1/1 ocfs2 fixes
Hi Linus,
This update is just a small set of ocfs2 fixes suitable for merging
late in the cycle as they're all either straightforward or trivial.
Please pull from 'upstream-linus' branch ofgit://git.kernel.org/pub/scm/linux/kernel/git/mfasheh/ocfs2.git upstream-linus
to receive the following updates:
fs/ocfs2/export.c | 5 --- fs/ocfs2/inode.c | 11 ++------ fs/ocfs2/namei.c | 69 +++++++++++++++++++++++++++------------------------- fs/ocfs2/ocfs2_fs.h | 43 +++++++++++++++++++++++++++++++- fs/ocfs2/symlink.c | 3 -- 5 files changed, 84 insertions(+), 47 deletions(-)
Mark Fasheh:
ocfs2: Don't print errors when following symlinks
ocfs2: Directory c/mtime update fixes
ocfs2: cleanup ocfs2_iget() errors
ocfs2: Add backup superblock info to ocfs2_fs.h
fs/ocfs2/export.c +1 -4
@@ -60,14 +60,11 @@ static struct dentry *ocfs2_get_dentry(s inode =ocfs2_iget (OCFS2_SB (sb), handle->ih_blkno,0 ); -if (IS_ERR (inode)) { -mlog_errno (PTR_ERR (inode)); +if (IS_ERR (inode))return (void *)inode; - }if (handle->ih_generation != inode->i_generation) {iput (inode); -mlog_errno (-ESTALE );return ERR_PTR (-ESTALE ); }
fs/ocfs2/inode.c +3 -8
@@ -146,7 +146,6 @@ struct inode *ocfs2_iget(struct ocfs2_suif (is_bad_inode (inode)) {iput (inode); inode =ERR_PTR (-ESTALE ); -mlog_errno (PTR_ERR (inode)); goto bail; }
@@ -155,8 +154,7 @@ bail:mlog (0 ,"returning inode with number %llu\n" , (unsigned long long )OCFS2_I (inode)->ip_blkno);mlog_exit_ptr (inode); - }else -mlog_errno (PTR_ERR (inode)); + }return inode; }
@@ -247,7 +245,7 @@ int ocfs2_populate_inode(struct inode *i* today. change if needed. */ if (!OCFS2_IS_VALID_DINODE (fe) || !(fe->i_flags &cpu_to_le32 (OCFS2_VALID_FL ))) { - mlog(ML_ERROR, "Invalid dinode: i_ino=%lu, i_blkno=%llu, " + mlog(0, "Invalid dinode: i_ino=%lu, i_blkno=%llu, " "signature = %.*s, flags = 0x%x\n", inode->i_ino, (unsigned long long)le64_to_cpu(fe->i_blkno), 7,
@@ -478,11 +476,8 @@ static int ocfs2_read_locked_inode(struc S_ISBLK(le16_to_cpu(fe->i_mode))) inode->i_rdev =huge_decode_dev (le64_to_cpu (fe->id1.dev1.i_rdev)); -if (ocfs2_populate_inode (inode, fe,0 ) <0 ) { -mlog (ML_ERROR ,"populate failed! i_blkno=%llu, i_ino=%lu\n" , - (unsigned long long )fe->i_blkno, inode->i_ino); +if (ocfs2_populate_inode (inode, fe,0 ) <0 ) goto bail; - }BUG_ON (args->fi_blkno !=le64_to_cpu (fe->i_blkno));
fs/ocfs2/namei.c +37 -32
128 lines not on this page · raw message
fs/ocfs2/ocfs2_fs.h +42 -1
67 lines not on this page · raw message
fs/ocfs2/symlink.c +1 -2
@@ -158,8 +158,7 @@ static void *ocfs2_follow_link(struct de } status =vfs_follow_link (nd, link); -if (status && status != -ENOENT ) -mlog_errno (status); + bail:if (page) {kunmap (page);