summaryrefslogtreecommitdiffstats
path: root/fs/cifs
diff options
context:
space:
mode:
authorDan Carpenter <error27@gmail.com>2010-04-26 12:10:06 +0200
committerSteve French <sfrench@us.ibm.com>2010-04-26 19:08:01 +0000
commitad6cca6d5d0f713e1987e20ed982cfa9eb16b27e (patch)
tree996437a3ded92acbd27decc9695b6c895c99a7c0 /fs/cifs
parent04912d6a20185473db025061b9b2c81fbdffc48b (diff)
downloadblackbird-op-linux-ad6cca6d5d0f713e1987e20ed982cfa9eb16b27e.tar.gz
blackbird-op-linux-ad6cca6d5d0f713e1987e20ed982cfa9eb16b27e.zip
cifs: change && to ||
This is a typo, if pvolume_info were NULL it would oops. This function is used in clean up and error handling. The current code never passes a NULL pvolume_info, but it could pass a NULL *pvolume_info if the kmalloc() failed. Signed-off-by: Dan Carpenter <error27@gmail.com> Acked-by: Jeff Layton <jlayton@redhat.com> Signed-off-by: Steve French <sfrench@us.ibm.com>
Diffstat (limited to 'fs/cifs')
-rw-r--r--fs/cifs/connect.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/cifs/connect.c b/fs/cifs/connect.c
index c2793bd1db4a..7a47c7c5c7e3 100644
--- a/fs/cifs/connect.c
+++ b/fs/cifs/connect.c
@@ -2421,7 +2421,7 @@ cleanup_volume_info(struct smb_vol **pvolume_info)
{
struct smb_vol *volume_info;
- if (!pvolume_info && !*pvolume_info)
+ if (!pvolume_info || !*pvolume_info)
return;
volume_info = *pvolume_info;
OpenPOWER on IntegriCloud