[PATCH] smbfs: Fix slab corruption in samba error path

[linux-2.6] / fs / ocfs2 / journal.c

diff --git a/fs/ocfs2/journal.c b/fs/ocfs2/journal.c
index 4be801f4559b5411261e4e23cac5836cd0c357e6..6a610ae5358394710688e518d022f25e85a51b41 100644 (file)
--- a/fs/ocfs2/journal.c
+++ b/fs/ocfs2/journal.c
@@ -377,7 +377,7 @@ int ocfs2_journal_access(struct ocfs2_journal_handle *handle,
        BUG_ON(!bh);
        BUG_ON(!(handle->flags & OCFS2_HANDLE_STARTED));
 
-       mlog_entry("bh->b_blocknr=%llu, type=%d (\"%s\"), bh->b_size = %hu\n",
+       mlog_entry("bh->b_blocknr=%llu, type=%d (\"%s\"), bh->b_size = %zu\n",
                   (unsigned long long)bh->b_blocknr, type,
                   (type == OCFS2_JOURNAL_ACCESS_CREATE) ?
                   "OCFS2_JOURNAL_ACCESS_CREATE" :
@@ -503,8 +503,8 @@ static void ocfs2_handle_cleanup_locks(struct ocfs2_journal *journal,
                ocfs2_meta_unlock(inode, 1);
                if (atomic_read(&inode->i_count) == 1)
                        mlog(ML_ERROR,
-                            "Inode %"MLFu64", I'm doing a last iput for!",
-                            OCFS2_I(inode)->ip_blkno);
+                            "Inode %llu, I'm doing a last iput for!",
+                            (unsigned long long)OCFS2_I(inode)->ip_blkno);
                iput(inode);
                kmem_cache_free(ocfs2_lock_cache, lock);
        }
@@ -582,7 +582,8 @@ int ocfs2_journal_init(struct ocfs2_journal *journal, int *dirty)
        }
 
        mlog(0, "inode->i_size = %lld\n", inode->i_size);
-       mlog(0, "inode->i_blocks = %lu\n", inode->i_blocks);
+       mlog(0, "inode->i_blocks = %llu\n",
+                       (unsigned long long)inode->i_blocks);
        mlog(0, "inode->ip_clusters = %u\n", OCFS2_I(inode)->ip_clusters);
 
        /* call the kernels journal init function now */
@@ -640,8 +641,9 @@ static int ocfs2_journal_toggle_dirty(struct ocfs2_super *osb,
                /* This is called from startup/shutdown which will
                 * handle the errors in a specific manner, so no need
                 * to call ocfs2_error() here. */
-               mlog(ML_ERROR, "Journal dinode %"MLFu64"  has invalid "
-                    "signature: %.*s", fe->i_blkno, 7, fe->i_signature);
+               mlog(ML_ERROR, "Journal dinode %llu  has invalid "
+                    "signature: %.*s", (unsigned long long)fe->i_blkno, 7,
+                    fe->i_signature);
                status = -EIO;
                goto out;
        }
@@ -849,8 +851,9 @@ static int ocfs2_force_read_journal(struct inode *inode)
 
        memset(bhs, 0, sizeof(struct buffer_head *) * CONCURRENT_JOURNAL_FILL);
 
-       mlog(0, "Force reading %lu blocks\n",
-            (inode->i_blocks >> (inode->i_sb->s_blocksize_bits - 9)));
+       mlog(0, "Force reading %llu blocks\n",
+               (unsigned long long)(inode->i_blocks >>
+                       (inode->i_sb->s_blocksize_bits - 9)));
 
        v_blkno = 0;
        while (v_blkno <
@@ -934,8 +937,8 @@ void ocfs2_complete_recovery(void *data)
 
                la_dinode = item->lri_la_dinode;
                if (la_dinode) {
-                       mlog(0, "Clean up local alloc %"MLFu64"\n",
-                            la_dinode->i_blkno);
+                       mlog(0, "Clean up local alloc %llu\n",
+                            (unsigned long long)la_dinode->i_blkno);
 
                        ret = ocfs2_complete_local_alloc_recovery(osb,
                                                                  la_dinode);
@@ -947,8 +950,8 @@ void ocfs2_complete_recovery(void *data)
 
                tl_dinode = item->lri_tl_dinode;
                if (tl_dinode) {
-                       mlog(0, "Clean up truncate log %"MLFu64"\n",
-                            tl_dinode->i_blkno);
+                       mlog(0, "Clean up truncate log %llu\n",
+                            (unsigned long long)tl_dinode->i_blkno);
 
                        ret = ocfs2_complete_truncate_log_recovery(osb,
                                                                   tl_dinode);
@@ -1473,11 +1476,11 @@ static int ocfs2_queue_orphans(struct ocfs2_super *osb,
                        if (de->file_type > OCFS2_FT_MAX) {
                                mlog(ML_ERROR,
                                     "block %llu contains invalid de: "
-                                    "inode = %"MLFu64", rec_len = %u, "
+                                    "inode = %llu, rec_len = %u, "
                                     "name_len = %u, file_type = %u, "
                                     "name='%.*s'\n",
                                     (unsigned long long)bh->b_blocknr,
-                                    le64_to_cpu(de->inode),
+                                    (unsigned long long)le64_to_cpu(de->inode),
                                     le16_to_cpu(de->rec_len),
                                     de->name_len,
                                     de->file_type,
@@ -1494,8 +1497,8 @@ static int ocfs2_queue_orphans(struct ocfs2_super *osb,
                        if (IS_ERR(iter))
                                continue;
 
-                       mlog(0, "queue orphan %"MLFu64"\n",
-                            OCFS2_I(iter)->ip_blkno);
+                       mlog(0, "queue orphan %llu\n",
+                            (unsigned long long)OCFS2_I(iter)->ip_blkno);
                        /* No locking is required for the next_orphan
                         * queue as there is only ever a single
                         * process doing orphan recovery. */
@@ -1588,7 +1591,7 @@ static int ocfs2_recover_orphans(struct ocfs2_super *osb,
 
        while (inode) {
                oi = OCFS2_I(inode);
-               mlog(0, "iput orphan %"MLFu64"\n", oi->ip_blkno);
+               mlog(0, "iput orphan %llu\n", (unsigned long long)oi->ip_blkno);
 
                iter = oi->ip_next_orphan;