Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6: [CIFS] mount of IPC$ breaks with iget patch [CIFS] remove trailing whitespace [CIFS] if get root inode fails during mount, cleanup tree connection
mariux64 · Aug 15, 2008 · 45edb89 · 45edb89
2 parents 8c9a9dd + ad66133
commit 45edb89
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 0 deletions.
diff --git a/fs/cifs/cifsfs.c b/fs/cifs/cifsfs.c
@@ -175,6 +175,8 @@ cifs_read_super(struct super_block *sb, void *data,
 	if (inode)
 		iput(inode);
 
+	cifs_umount(sb, cifs_sb);
+
 out_mount_failed:
 	if (cifs_sb) {
 #ifdef CONFIG_CIFS_DFS_UPCALL

diff --git a/fs/cifs/inode.c b/fs/cifs/inode.c
@@ -649,6 +649,7 @@ struct inode *cifs_iget(struct super_block *sb, unsigned long ino)
 		inode->i_fop = &simple_dir_operations;
 		inode->i_uid = cifs_sb->mnt_uid;
 		inode->i_gid = cifs_sb->mnt_gid;
+	} else if (rc) {
 		_FreeXid(xid);
 		iget_failed(inode);
 		return ERR_PTR(rc);