From: <gregkh@suse.de>
To: zbr@ioremap.net, geert@linux-m68k.org, gregkh@suse.de,
hch@lst.de, linux-kernel@vger.kernel.org,
viro@zeniv.linux.org.uk
Subject: patch staging-pohmelfs-fix-build-error.patch added to gregkh-2.6 tree
Date: Fri, 18 Dec 2009 11:33:46 -0800 [thread overview]
Message-ID: <1261164826606@kroah.org> (raw)
In-Reply-To: <20091218124043.GA25653@ioremap.net>
This is a note to let you know that I've just added the patch titled
Subject: Staging: pohmelfs: fix build error
to my gregkh-2.6 tree. Its filename is
staging-pohmelfs-fix-build-error.patch
This tree can be found at
http://www.kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/patches/
>From zbr@ioremap.net Fri Dec 18 10:36:58 2009
From: Evgeniy Polyakov <zbr@ioremap.net>
Date: Fri, 18 Dec 2009 15:40:44 +0300
Subject: Staging: pohmelfs: fix build error
To: Geert Uytterhoeven <geert@linux-m68k.org>
Cc: Greg Kroah-Hartman <gregkh@suse.de>, Christoph Hellwig <hch@lst.de>, Al Viro <viro@zeniv.linux.org.uk>, Linux Kernel Development <linux-kernel@vger.kernel.org>, linux-fsdevel@vger.kernel.org, devel@driverdev.osuosl.org
Message-ID: <20091218124043.GA25653@ioremap.net>
Content-Disposition: inline
Hi.
On Fri, Dec 18, 2009 at 01:13:38PM +0100, Geert Uytterhoeven (geert@linux-m68k.org) wrote:
> There's a conflict in 2.6.33-rc1 between the following 2 commits:
>
> commit ff8079d4f1016a12e34ab323737314f24127dd ("kill I_LOCK")
> commit e3eec94dc91c39f2bd7939294b9cd4a65a82db44 ("Staging: pohmelfs: directory
> operations")
>
> drivers/staging/pohmelfs/dir.c: In function 'pohmelfs_remove_entry':
> drivers/staging/pohmelfs/dir.c:725: error: 'I_LOCK' undeclared (first use in this function)
> drivers/staging/pohmelfs/dir.c:725: error: (Each undeclared identifier is reported only once
> drivers/staging/pohmelfs/dir.c:725: error: for each function it appears in.)
This should fix it.
Signed-off-by: Evgeniy Polyakov <zbr@ioremap.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---
drivers/staging/pohmelfs/dir.c | 2 --
1 file changed, 2 deletions(-)
--- a/drivers/staging/pohmelfs/dir.c
+++ b/drivers/staging/pohmelfs/dir.c
@@ -722,8 +722,6 @@ static int pohmelfs_remove_entry(struct
if (inode->i_nlink)
inode_dec_link_count(inode);
}
- dprintk("%s: inode: %p, lock: %ld, unhashed: %d.\n",
- __func__, pi, inode->i_state & I_LOCK, hlist_unhashed(&inode->i_hash));
return err;
}
prev parent reply other threads:[~2009-12-18 19:36 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-12-18 12:13 pohmelfs needs I_LOCK Geert Uytterhoeven
2009-12-18 12:40 ` Evgeniy Polyakov
2009-12-18 19:33 ` gregkh [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1261164826606@kroah.org \
--to=gregkh@suse.de \
--cc=geert@linux-m68k.org \
--cc=hch@lst.de \
--cc=linux-kernel@vger.kernel.org \
--cc=viro@zeniv.linux.org.uk \
--cc=zbr@ioremap.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox