linux-kernel - patch staging-pohmelfs-fix-build-error.patch added to gregkh-2.6 tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <1261164826606@kroah.org>
Date:	Fri, 18 Dec 2009 11:33:46 -0800
From:	<gregkh@...e.de>
To:	zbr@...emap.net, geert@...ux-m68k.org, gregkh@...e.de, hch@....de,
	linux-kernel@...r.kernel.org, viro@...iv.linux.org.uk
Subject: patch staging-pohmelfs-fix-build-error.patch added to gregkh-2.6 tree


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@...emap.net  Fri Dec 18 10:36:58 2009
From: Evgeniy Polyakov <zbr@...emap.net>
Date: Fri, 18 Dec 2009 15:40:44 +0300
Subject: Staging: pohmelfs: fix build error
To: Geert Uytterhoeven <geert@...ux-m68k.org>
Cc: Greg Kroah-Hartman <gregkh@...e.de>, Christoph Hellwig <hch@....de>, Al Viro <viro@...iv.linux.org.uk>, Linux Kernel Development <linux-kernel@...r.kernel.org>, linux-fsdevel@...r.kernel.org, devel@...verdev.osuosl.org
Message-ID: <20091218124043.GA25653@...emap.net>
Content-Disposition: inline


Hi.

On Fri, Dec 18, 2009 at 01:13:38PM +0100, Geert Uytterhoeven (geert@...ux-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@...emap.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@...e.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;
 }

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/