diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-08-15 20:02:35 +0200 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-08-15 20:02:35 +0200 |
commit | 45edb89ffd6386f95a7a9e1e5461b0e61c76aa14 (patch) | |
tree | e98cdb2860f6ac4e4bb6b2e233a1032eb18d08bb /fs/cifs/inode.c | |
parent | tty: remove resize window special case (diff) | |
parent | [CIFS] mount of IPC$ breaks with iget patch (diff) | |
download | linux-45edb89ffd6386f95a7a9e1e5461b0e61c76aa14.tar.xz linux-45edb89ffd6386f95a7a9e1e5461b0e61c76aa14.zip |
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
Diffstat (limited to 'fs/cifs/inode.c')
-rw-r--r-- | fs/cifs/inode.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/cifs/inode.c b/fs/cifs/inode.c index 28a22092d450..848286861c31 100644 --- 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); |