diff --git a/[refs] b/[refs] index 84bce5988a4a..1db2024badad 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9d81523480c8c5b07a4899a084b3f4264a575184 +refs/heads/master: 74553b1b6a8556e08757b4bce537fd8332b93898 diff --git a/trunk/fs/cifs/inode.c b/trunk/fs/cifs/inode.c index 82612be9477b..079f39a8dd3b 100644 --- a/trunk/fs/cifs/inode.c +++ b/trunk/fs/cifs/inode.c @@ -1274,7 +1274,7 @@ int cifs_rename(struct inode *source_inode, struct dentry *source_direntry, info_buf_source = kmalloc(2 * sizeof(FILE_UNIX_BASIC_INFO), GFP_KERNEL); - if (info_buf_source != NULL) + if (info_buf_source == NULL) goto unlink_target; info_buf_target = info_buf_source + 1;