From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753269AbdHTQiJ (ORCPT ); Sun, 20 Aug 2017 12:38:09 -0400 Received: from mout.web.de ([212.227.17.11]:53782 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753101AbdHTQiH (ORCPT ); Sun, 20 Aug 2017 12:38:07 -0400 Subject: [PATCH 4/8] CIFS: Use common error handling code in cifs_mknod() From: SF Markus Elfring To: linux-cifs@vger.kernel.org, samba-technical@lists.samba.org, Steve French Cc: LKML , kernel-janitors@vger.kernel.org References: <826310e5-e01c-38af-90df-c5630f761a4d@users.sourceforge.net> Message-ID: Date: Sun, 20 Aug 2017 18:38:04 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.2.1 MIME-Version: 1.0 In-Reply-To: <826310e5-e01c-38af-90df-c5630f761a4d@users.sourceforge.net> Content-Type: text/plain; charset=utf-8 Content-Language: en-GB Content-Transfer-Encoding: 7bit X-Provags-ID: V03:K0:4dozeLYdrUNbTA5Kcvh69r7BSTDTqtiGUVSFUMlznASygKTWggn OhKYODOtuoWYieobw9k2oPWcAM3aUbbxj7iSHgrfnZLexpyZvKhZnnKZcljmHlVYVFvJVEB Z5pflJeiGVDgBCg0ER1pZPAxgkB/BwxIX7daDNMFoy63A7g1Nlw6qEeQvVVDtHXsIqGs2N8 IRrDAVQWgcXli+j8qYxUw== X-UI-Out-Filterresults: notjunk:1;V01:K0:Ww4y/hHQI+I=:hfuwKVADMt0u6RhiiZNvgm 5A3sDuwDr0XeSBmM2KA0pEhWyOxCJz8v0li/1mdeu4yYdRmXeEEL8c9Ae2hSiGzbcFWNXP+u3 fHKS2mxrqvlRRAk0KIhygAGW3K1BuViPkXGq5G906SR2hDWz6000vBP/LG7UPQFtI2CYl3P7q OEJ/YZsFYMsC8X/kHwSxvHGxbOCEn1l+kN3bNvPb5NWoMb5PncBtmn8qgB/kusFCQH1lbhGDz dPLcHs61/BdigdsfXtq6xGdTaJd05K0JORKjPbkmKOyDyE6UxhcJSYadhE4qCqEdM2LnIoz3r OPZotmQRAUPa2Ox4Z1gQspAN8HdnO8xgNF15q7bZm0Q3EcB0x4uvQXoBQddoMpNw/VblDDZp3 fsSchWRFpfD9rQqp8XbntmAnT4ukEgCg+KLh5zT90QUUJ+I5M4oi3SuG5syftohDNcKG0h5/U 8+xjBf+H0sNSKv6DRGaPPXICDyyeNFV6nnFr23VpzQQ6mIh9sG4SWxRfvtqznxIC62WyKmQM8 1tk/ag5t4tXkbOKNEIl1Rbb3/KtCdeHnJ2ZVSzQJqcuedbbLgaw9DDGBB0HzflR867Gd31cuv wL8+p18T8TX0WFRE9S6xF1i6LhSbQM0KIvZQnK7uFOf3C00uoRot6YaYZS9f0W22uwrW7D35N fsxHVro6sVvGCJ55epS7pL26bgmIb3IKcqdoH69lDJR12/Zl5a+6bJJ8rEKveFlDeNnN73k9j 7uc6OZQ03GiI6HjOheiRR5v/+i22nxViaC9KHZA+4klMSQOKxyBtONbCAhvnSi7zLiWnTveJa HHQaAtujbfaK6/9mq8fElh3pRACNByRM7bGRg3lIfoCPaU7sso= Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Markus Elfring Date: Sun, 20 Aug 2017 16:30:06 +0200 Add a jump target so that a bit of exception handling can be better reused in this function. Signed-off-by: Markus Elfring --- fs/cifs/dir.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/fs/cifs/dir.c b/fs/cifs/dir.c index b43e535ced8a..41039ab12643 100644 --- a/fs/cifs/dir.c +++ b/fs/cifs/dir.c @@ -687,8 +687,7 @@ int cifs_mknod(struct inode *inode, struct dentry *direntry, umode_t mode, if (buf == NULL) { kfree(full_path); rc = -ENOMEM; - free_xid(xid); - return rc; + goto free_id; } if (backup_cred(cifs_sb)) @@ -744,8 +743,9 @@ int cifs_mknod(struct inode *inode, struct dentry *direntry, umode_t mode, mknod_out: kfree(full_path); kfree(buf); - free_xid(xid); cifs_put_tlink(tlink); +free_id: + free_xid(xid); return rc; } -- 2.14.0