OMAP3: Update USBHOST pinmux settings

[pandora-kernel.git] / fs / reiserfs / stree.c

diff --git a/fs/reiserfs/stree.c b/fs/reiserfs/stree.c
index ca41567..abbc64d 100644 (file)
--- a/fs/reiserfs/stree.c
+++ b/fs/reiserfs/stree.c
@@ -1419,8 +1419,7 @@ int reiserfs_delete_object(struct reiserfs_transaction_handle *th,
 
                inode_generation =
                    &REISERFS_SB(th->t_super)->s_rs->s_inode_generation;
-               *inode_generation =
-                   cpu_to_le32(le32_to_cpu(*inode_generation) + 1);
+               le32_add_cpu(inode_generation, 1);
        }
 /* USE_INODE_GENERATION_COUNTER */
 #endif
@@ -1458,9 +1457,6 @@ static void unmap_buffers(struct page *page, loff_t pos)
                                }
                                bh = next;
                        } while (bh != head);
-                       if (PAGE_SIZE == bh->b_size) {
-                               cancel_dirty_page(page, PAGE_CACHE_SIZE);
-                       }
                }
        }
 }