ipoib: switch to netif_napi_add_weight()

[linux-2.6-microblaze.git] / fs / ntfs3 / fslog.c

diff --git a/fs/ntfs3/fslog.c b/fs/ntfs3/fslog.c
index 06492f0..49b7df6 100644 (file)
--- a/fs/ntfs3/fslog.c
+++ b/fs/ntfs3/fslog.c
@@ -1185,8 +1185,6 @@ static int log_read_rst(struct ntfs_log *log, u32 l_size, bool first,
        if (!r_page)
                return -ENOMEM;
 
-       memset(info, 0, sizeof(struct restart_info));
-
        /* Determine which restart area we are looking for. */
        if (first) {
                vbo = 0;
@@ -3791,10 +3789,11 @@ int log_replay(struct ntfs_inode *ni, bool *initialized)
        if (!log)
                return -ENOMEM;
 
+       memset(&rst_info, 0, sizeof(struct restart_info));
+
        log->ni = ni;
        log->l_size = l_size;
        log->one_page_buf = kmalloc(page_size, GFP_NOFS);
-
        if (!log->one_page_buf) {
                err = -ENOMEM;
                goto out;
@@ -3842,6 +3841,7 @@ int log_replay(struct ntfs_inode *ni, bool *initialized)
        if (rst_info.vbo)
                goto check_restart_area;
 
+       memset(&rst_info2, 0, sizeof(struct restart_info));
        err = log_read_rst(log, l_size, false, &rst_info2);
 
        /* Determine which restart area to use. */
@@ -4085,8 +4085,10 @@ process_log:
                if (client == LFS_NO_CLIENT_LE) {
                        /* Insert "NTFS" client LogFile. */
                        client = ra->client_idx[0];
-                       if (client == LFS_NO_CLIENT_LE)
-                               return -EINVAL;
+                       if (client == LFS_NO_CLIENT_LE) {
+                               err = -EINVAL;
+                               goto out;
+                       }
 
                        t16 = le16_to_cpu(client);
                        cr = ca + t16;