Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[linux.git] / fs / ubifs / gc.c

diff --git a/fs/ubifs/gc.c b/fs/ubifs/gc.c
index 821b34816976a112df8d950555500ed9bbf64361..7b35e3d6cde72c517a9a91db25e268b94e7098cf 100644 (file)
--- a/fs/ubifs/gc.c
+++ b/fs/ubifs/gc.c
@@ -113,7 +113,7 @@ static int switch_gc_head(struct ubifs_info *c)
  * data_nodes_cmp - compare 2 data nodes.
  * @priv: UBIFS file-system description object
  * @a: first data node
- * @a: second data node
+ * @b: second data node
  *
  * This function compares data nodes @a and @b. Returns %1 if @a has greater
  * inode or block number, and %-1 otherwise.
@@ -846,10 +846,6 @@ int ubifs_gc_start_commit(struct ubifs_info *c)
         */
        while (1) {
                lp = ubifs_fast_find_freeable(c);
-               if (IS_ERR(lp)) {
-                       err = PTR_ERR(lp);
-                       goto out;
-               }
                if (!lp)
                        break;
                ubifs_assert(!(lp->flags & LPROPS_TAKEN));