diff options
| author | Dave Kleikamp <shaggy@austin.ibm.com> | 2005-06-02 12:12:57 -0500 |
|---|---|---|
| committer | Dave Kleikamp <shaggy@austin.ibm.com> | 2005-06-02 12:12:57 -0500 |
| commit | 7078253c085c037c070ca4e8bc9e9e7f18aa1e84 (patch) | |
| tree | eaf56c1a77b0de6ee82e23cee4433b2c4a47e67e /fs/hostfs/hostfs_kern.c | |
| parent | 259692bd5a2b2c2d351dd90748ba4126bc2a21b9 (diff) | |
| parent | 1e86d1c648508fd50e6c9960576b87906a7906ad (diff) | |
| download | kernel_samsung_smdk4412-7078253c085c037c070ca4e8bc9e9e7f18aa1e84.zip kernel_samsung_smdk4412-7078253c085c037c070ca4e8bc9e9e7f18aa1e84.tar.gz kernel_samsung_smdk4412-7078253c085c037c070ca4e8bc9e9e7f18aa1e84.tar.bz2 | |
Merge with /home/shaggy/git/linus-clean/
Signed-off-by: Dave Kleikamp <shaggy@austin.ibm.com>
Diffstat (limited to 'fs/hostfs/hostfs_kern.c')
| -rw-r--r-- | fs/hostfs/hostfs_kern.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/fs/hostfs/hostfs_kern.c b/fs/hostfs/hostfs_kern.c index e6c63d9..4bf43ea 100644 --- a/fs/hostfs/hostfs_kern.c +++ b/fs/hostfs/hostfs_kern.c @@ -23,7 +23,6 @@ #include "kern_util.h" #include "kern.h" #include "user_util.h" -#include "2_5compat.h" #include "init.h" struct hostfs_inode_info { @@ -991,13 +990,17 @@ static int hostfs_fill_sb_common(struct super_block *sb, void *d, int silent) goto out_put; err = read_inode(root_inode); - if(err) - goto out_put; + if(err){ + /* No iput in this case because the dput does that for us */ + dput(sb->s_root); + sb->s_root = NULL; + goto out_free; + } return(0); out_put: - iput(root_inode); + iput(root_inode); out_free: kfree(name); out: |