summaryrefslogtreecommitdiffstats
path: root/fs/cifs
diff options
context:
space:
mode:
authorSteve French <sfrench@us.ibm.com>2006-03-31 03:37:08 +0000
committerSteve French <sfrench@us.ibm.com>2006-03-31 03:37:08 +0000
commit6910ab30a29d10e0fec7710b2ed857a2201e2468 (patch)
treeac8ca0b969f623af42519defcf5816c136459087 /fs/cifs
parentd62e54abca1146981fc9f98f85ff398a113a22c2 (diff)
downloadop-kernel-dev-6910ab30a29d10e0fec7710b2ed857a2201e2468.zip
op-kernel-dev-6910ab30a29d10e0fec7710b2ed857a2201e2468.tar.gz
[CIFS] Fix unlink oops when indirectly called in rename error path
under heavy stress. Signed-off-by: Steve French <sfrench@us.ibm.com>
Diffstat (limited to 'fs/cifs')
-rw-r--r--fs/cifs/inode.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/fs/cifs/inode.c b/fs/cifs/inode.c
index e842ce9..ca91ea3 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
OpenPOWER on IntegriCloud