aboutsummaryrefslogtreecommitdiff
path: root/fs/minix/dir.c
diff options
context:
space:
mode:
authorDmitry Torokhov <dmitry.torokhov@gmail.com>2010-06-30 15:07:09 -0700
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2010-06-30 15:07:09 -0700
commit08fa16b6b75005c120b59d00ae42a0b7cc68db45 (patch)
treec5f22412467f72dd0c7291bbb958a9485e894f02 /fs/minix/dir.c
parent1796b983cc4cbbed5e9e478b03591609a2c21987 (diff)
parent7e27d6e778cd87b6f2415515d7127eba53fe5d02 (diff)
Merge commit 'v2.6.35-rc3' into next
Diffstat (limited to 'fs/minix/dir.c')
-rw-r--r--fs/minix/dir.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/fs/minix/dir.c b/fs/minix/dir.c
index 91969589131..1dbf921ca44 100644
--- a/fs/minix/dir.c
+++ b/fs/minix/dir.c
@@ -75,10 +75,6 @@ static struct page * dir_get_page(struct inode *dir, unsigned long n)
if (!IS_ERR(page))
kmap(page);
return page;
-
-fail:
- dir_put_page(page);
- return ERR_PTR(-EIO);
}
static inline void *minix_next_entry(void *de, struct minix_sb_info *sbi)