Merge branch 'akpm' (Andrew's incoming - part two)

[pandora-kernel.git] / fs / ext4 / mmp.c

diff --git a/fs/ext4/mmp.c b/fs/ext4/mmp.c
index 9bdef3f..7ea4ba4 100644 (file)
--- a/fs/ext4/mmp.c
+++ b/fs/ext4/mmp.c
@@ -109,7 +109,7 @@ static int kmmpd(void *data)
        mmp->mmp_check_interval = cpu_to_le16(mmp_check_interval);
        bdevname(bh->b_bdev, mmp->mmp_bdevname);
 
-       memcpy(mmp->mmp_nodename, init_utsname()->sysname,
+       memcpy(mmp->mmp_nodename, init_utsname()->nodename,
               sizeof(mmp->mmp_nodename));
 
        while (!kthread_should_stop()) {
@@ -125,8 +125,9 @@ static int kmmpd(void *data)
                 * Don't spew too many error messages. Print one every
                 * (s_mmp_update_interval * 60) seconds.
                 */
-               if (retval && (failed_writes % 60) == 0) {
-                       ext4_error(sb, "Error writing to MMP block");
+               if (retval) {
+                       if ((failed_writes % 60) == 0)
+                               ext4_error(sb, "Error writing to MMP block");
                        failed_writes++;
                }
 
@@ -295,7 +296,8 @@ skip:
        /*
         * write a new random sequence number.
         */
-       mmp->mmp_seq = seq = cpu_to_le32(mmp_new_seq());
+       seq = mmp_new_seq();
+       mmp->mmp_seq = cpu_to_le32(seq);
 
        retval = write_mmp_block(bh);
        if (retval)