Merge branch 'akpm' (patches from Andrew)

Merge fixes from Andrew Morton:
 "10 fixes"

* emailed patches from Andrew Morton <akpm@linux-foundation.org>:
  drivers/pinctrl/intel/pinctrl-baytrail.c: fix build with gcc-4.4
  update "mm/zsmalloc: don't fail if can't create debugfs info"
  dma-debug: avoid spinlock recursion when disabling dma-debug
  mm: oom_reaper: remove some bloat
  memcg: fix mem_cgroup_out_of_memory() return value.
  ocfs2: fix improper handling of return errno
  mm: slub: remove unused virt_to_obj()
  mm: kasan: remove unused 'reserved' field from struct kasan_alloc_meta
  mm: make CONFIG_DEFERRED_STRUCT_PAGE_INIT depends on !FLATMEM explicitly
  seqlock: fix raw_read_seqcount_latch()

1 files changed, 1 insertions, 6 deletions

diff --git a/fs/ocfs2/inode.c b/fs/ocfs2/inode.c
index 0748777f2e2a..c56a7679df93 100644
--- a/fs/ocfs2/inode.c
+++ b/fs/ocfs2/inode.c
@@ -176,12 +176,7 @@ struct inode *ocfs2_iget(struct ocfs2_super *osb, u64 blkno, unsigned flags,
         }
         if (is_bad_inode(inode)) {
                 iput(inode);
-                if ((flags & OCFS2_FI_FLAG_FILECHECK_CHK) ||
-                    (flags & OCFS2_FI_FLAG_FILECHECK_FIX))
-                        /* Return OCFS2_FILECHECK_ERR_XXX related errno */
-                        inode = ERR_PTR(rc);
-                else
-                        inode = ERR_PTR(-ESTALE);
+                inode = ERR_PTR(rc);
                 goto bail;
         }