From patchwork Mon Apr 26 10:10:06 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dan Carpenter X-Patchwork-Id: 102638 Received: from lists.samba.org (fn.samba.org [216.83.154.106]) by demeter.kernel.org (8.14.3/8.14.3) with ESMTP id o4RCZ0L8012775 for ; Thu, 27 May 2010 12:35:36 GMT Received: from fn.samba.org (localhost [127.0.0.1]) by lists.samba.org (Postfix) with ESMTP id 1C519AC426; Thu, 27 May 2010 06:34:22 -0600 (MDT) X-Spam-Checker-Version: SpamAssassin 3.2.5 (2008-06-10) on fn.samba.org X-Spam-Level: X-Spam-Status: No, score=-4.1 required=3.8 tests=BAYES_00,SPF_PASS autolearn=ham version=3.2.5 X-Original-To: linux-cifs-client@lists.samba.org Delivered-To: linux-cifs-client@lists.samba.org Received: from mail-qy0-f173.google.com (mail-qy0-f173.google.com [209.85.221.173]) by lists.samba.org (Postfix) with ESMTP id 5A911AD16A; Mon, 26 Apr 2010 04:10:30 -0600 (MDT) Received: by qyk4 with SMTP id 4so15423459qyk.17 for ; Mon, 26 Apr 2010 03:10:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:date:from:to:cc:subject :message-id:mime-version:content-type:content-disposition:user-agent; bh=yM5xdW+Ayigf8QRsVuNxZZG3/o09qYkqs9ZxLhiOZdM=; b=p4kTrVSZ9xcxY4Wf4hlPCX2WHCLz0szogNEypgTggE+HsMrt4PkTiTGuEhdJleUh3R gcOiCnEtYu4IFPrU/4hmEyZ9svhHhQVyZb1knhkIakqklnd8wgPORIhevVfVOMNI31T9 SpaUeyiKQOaIdgmrwWGeaurmNJwonkzrwRRrg= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=date:from:to:cc:subject:message-id:mime-version:content-type :content-disposition:user-agent; b=xHbHvQUYKp97iiAlyZp/IzxzpkPVkdcjVcTR6PnDD2ZrHvUlBOYisRw72ZrtoONwR6 WekGkwRy882Yn5CnWaLDqbYYgwqpfTLgMEOm2twCD276vnz00j0967ubtkne+OSKuECc 4iduCpOPWCcObaVMo1mWYQOzBPvTNWNyXI7ms= Received: by 10.224.36.18 with SMTP id r18mr1154498qad.362.1272276626914; Mon, 26 Apr 2010 03:10:26 -0700 (PDT) Received: from bicker ([41.222.20.196]) by mx.google.com with ESMTPS id 8sm7793233qwj.8.2010.04.26.03.10.21 (version=TLSv1/SSLv3 cipher=RC4-MD5); Mon, 26 Apr 2010 03:10:26 -0700 (PDT) Date: Mon, 26 Apr 2010 12:10:06 +0200 From: Dan Carpenter To: Steve French Message-ID: <20100426101006.GQ29093@bicker> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.18 (2008-05-17) X-Mailman-Approved-At: Thu, 27 May 2010 06:34:17 -0600 Cc: Jeff Layton , kernel-janitors@vger.kernel.org, samba-technical@lists.samba.org, Igor Mammedov , linux-cifs-client@lists.samba.org, Shirish Pargaonkar Subject: [linux-cifs-client] [patch] cifs: change && to || X-BeenThere: linux-cifs-client@lists.samba.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: The Linux CIFS VFS client List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: linux-cifs-client-bounces@lists.samba.org Errors-To: linux-cifs-client-bounces@lists.samba.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]); Thu, 27 May 2010 12:35:36 +0000 (UTC) diff --git a/fs/cifs/connect.c b/fs/cifs/connect.c index d9566bf..85a35a4 100644 --- a/fs/cifs/connect.c +++ b/fs/cifs/connect.c @@ -2262,7 +2262,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;