Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756130Ab0D0OdP (ORCPT ); Tue, 27 Apr 2010 10:33:15 -0400 Received: from moutng.kundenserver.de ([212.227.17.10]:50065 "EHLO moutng.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756111Ab0D0OdN (ORCPT ); Tue, 27 Apr 2010 10:33:13 -0400 From: Arnd Bergmann To: John Kacur Subject: Re: [PATCH 1/7] logfs: push down BKL into ioctl function Date: Tue, 27 Apr 2010 16:32:47 +0200 User-Agent: KMail/1.12.2 (Linux/2.6.31-19-generic; KDE/4.3.2; x86_64; ; ) Cc: lkml , Linus Torvalds , Frederic Weisbecker , Jan Blunck , Thomas Gleixner , =?utf-8?q?J=C3=B6rn_Engel?= References: <1272378265-10909-2-git-send-email-arnd@arndb.de> In-Reply-To: <1272378265-10909-2-git-send-email-arnd@arndb.de> MIME-Version: 1.0 Content-Type: Text/Plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <201004271632.47819.arnd@arndb.de> X-Provags-ID: V01U2FsdGVkX18layMGJ/uq17m1cYdNdhivoqmabEIyqzvssuI lTjktxcpk3V8UkNLj0wuOHxyXhfB578oCSrHWapfxCZXKkD5PI B/EZM5vO4mPG8MEH9GmLQ== Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 871 Lines: 22 On Tuesday 27 April 2010, Arnd Bergmann wrote: > diff --git a/fs/smbfs/ioctl.c b/fs/smbfs/ioctl.c > index dbae1f8..910215b 100644 > --- a/fs/smbfs/ioctl.c > +++ b/fs/smbfs/ioctl.c > @@ -26,7 +26,7 @@ int > smb_ioctl(struct inode *inode, struct file *filp, > unsigned int cmd, unsigned long arg) > { > - struct smb_sb_info *server = server_from_inode(inode); > + struct smb_sb_info *server = server_from_inode(filp->f_path.dentry->d_inode); > struct smb_conn_opt opt; > int result = -EINVAL; This hunk obviously belongs to the smbfs patch, not the logfs patch. Sorry about that. Arnd -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/