diff --git a/[refs] b/[refs] index 2c77fff97e67..c2b19544152b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d62e54abca1146981fc9f98f85ff398a113a22c2 +refs/heads/master: 6910ab30a29d10e0fec7710b2ed857a2201e2468 diff --git a/trunk/fs/cifs/inode.c b/trunk/fs/cifs/inode.c index e842ce9f6547..ca91ea38d611 100644 --- a/trunk/fs/cifs/inode.c +++ b/trunk/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