mirror of
https://github.com/torvalds/linux.git
synced 2024-11-11 06:31:49 +00:00
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
This commit is contained in:
commit
45edb89ffd
@ -175,6 +175,8 @@ out_no_root:
|
||||
if (inode)
|
||||
iput(inode);
|
||||
|
||||
cifs_umount(sb, cifs_sb);
|
||||
|
||||
out_mount_failed:
|
||||
if (cifs_sb) {
|
||||
#ifdef CONFIG_CIFS_DFS_UPCALL
|
||||
|
@ -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);
|
||||
|
Loading…
Reference in New Issue
Block a user