Merge with git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git

1 files changed, 13 insertions, 9 deletions

diff --git a/fs/cifs/inode.c b/fs/cifs/inode.c
index 598eec9778f6..957ddd1571c6 100644
--- a/fs/cifs/inode.c
+++ b/fs/cifs/inode.c
@@ -565,11 +565,14 @@ int cifs_unlink(struct inode *inode, struct dentry *direntry)
         struct cifsInodeInfo *cifsInode;
         FILE_BASIC_INFO *pinfo_buf;
 
-        cFYI(1, ("cifs_unlink, inode = 0x%p with ", inode));
+        cFYI(1, ("cifs_unlink, inode = 0x%p", inode));
 
         xid = GetXid();
 
-        cifs_sb = CIFS_SB(inode->i_sb);
+        if(inode)
+                cifs_sb = CIFS_SB(inode->i_sb);
+        else
+                cifs_sb = CIFS_SB(direntry->d_sb);
         pTcon = cifs_sb->tcon;
 
         /* Unlink can be called from rename so we can not grab the sem here
@@ -609,9 +612,8 @@ int cifs_unlink(struct inode *inode, struct dentry *direntry)
                 }
         } else if (rc == -EACCES) {
                 /* try only if r/o attribute set in local lookup data? */
-                pinfo_buf = kmalloc(sizeof(FILE_BASIC_INFO), GFP_KERNEL);
+                pinfo_buf = kzalloc(sizeof(FILE_BASIC_INFO), GFP_KERNEL);
                 if (pinfo_buf) {
-                        memset(pinfo_buf, 0, sizeof(FILE_BASIC_INFO));
                         /* ATTRS set to normal clears r/o bit */
                         pinfo_buf->Attributes = cpu_to_le32(ATTR_NORMAL);
                         if (!(pTcon->ses->flags & CIFS_SES_NT4))
@@ -693,9 +695,11 @@ int cifs_unlink(struct inode *inode, struct dentry *direntry)
                                            when needed */
                 direntry->d_inode->i_ctime = current_fs_time(inode->i_sb);
         }
-        inode->i_ctime = inode->i_mtime = current_fs_time(inode->i_sb);
-        cifsInode = CIFS_I(inode);
-        cifsInode->time = 0;    /* force revalidate of dir as well */
+        if(inode) {
+                inode->i_ctime = inode->i_mtime = current_fs_time(inode->i_sb);
+                cifsInode = CIFS_I(inode);
+                cifsInode->time = 0;    /* force revalidate of dir as well */
+        }
 
         kfree(full_path);
         FreeXid(xid);
@@ -1167,7 +1171,7 @@ int cifs_setattr(struct dentry *direntry, struct iattr *attrs)
                                                 nfid, npid, FALSE);
                         atomic_dec(&open_file->wrtPending);
                         cFYI(1,("SetFSize for attrs rc = %d", rc));
-                        if(rc == -EINVAL) {
+                        if((rc == -EINVAL) || (rc == -EOPNOTSUPP)) {
                                 int bytes_written;
                                 rc = CIFSSMBWrite(xid, pTcon,
                                                   nfid, 0, attrs->ia_size,
@@ -1189,7 +1193,7 @@ int cifs_setattr(struct dentry *direntry, struct iattr *attrs)
                                            cifs_sb->mnt_cifs_flags &
                                                 CIFS_MOUNT_MAP_SPECIAL_CHR);
                         cFYI(1, ("SetEOF by path (setattrs) rc = %d", rc));
-                        if(rc == -EINVAL) {
+                        if((rc == -EINVAL) || (rc == -EOPNOTSUPP)) {
                                 __u16 netfid;
                                 int oplock = FALSE;