diff options
| author | Steve French <sfrench@us.ibm.com> | 2006-03-31 05:37:08 +0200 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2006-03-31 05:37:08 +0200 |
| commit | 6910ab30a29d10e0fec7710b2ed857a2201e2468 (patch) | |
| tree | ac8ca0b969f623af42519defcf5816c136459087 | |
| parent | Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git (diff) | |
| download | linux-6910ab30a29d10e0fec7710b2ed857a2201e2468.tar.xz linux-6910ab30a29d10e0fec7710b2ed857a2201e2468.zip | |
[CIFS] Fix unlink oops when indirectly called in rename error path
under heavy stress.
Signed-off-by: Steve French <sfrench@us.ibm.com>
| -rw-r--r-- | fs/cifs/inode.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/fs/cifs/inode.c b/fs/cifs/inode.c index e842ce9f6547..ca91ea38d611 100644 --- a/fs/cifs/inode.c +++ b/fs/cifs/inode.c @@ -569,7 +569,10 @@ int cifs_unlink(struct inode *inode, struct dentry *direntry) xid = GetXid(); - cifs_sb = CIFS_SB(inode->i_sb); + if(inode) + cifs_sb = CIFS_SB(inode->i_sb); + else + cifs_sb = CIFS_SB(dentry->d_sb); pTcon = cifs_sb->tcon; /* Unlink can be called from rename so we can not grab the sem here |