From: Adrian Bunk <bunk@stusta.de>
To: Andrew Morton <akpm@osdl.org>
Cc: linux-kernel@vger.kernel.org
Subject: [RFC: -mm patch] fs/locks.c: make posix_locks_deadlock() static
Date: Sat, 4 Mar 2006 13:14:57 +0100 [thread overview]
Message-ID: <20060304121457.GS9295@stusta.de> (raw)
In-Reply-To: <20060303045651.1f3b55ec.akpm@osdl.org>
On Fri, Mar 03, 2006 at 04:56:51AM -0800, Andrew Morton wrote:
>...
> Changes since 2.6.16-rc5-mm1:
>...
> git-nfs.patch
>...
> git trees
>...
We can now make posix_locks_deadlock() static.
Signed-off-by: Adrian Bunk <bunk@stusta.de>
---
fs/locks.c | 4 +---
include/linux/fs.h | 1 -
2 files changed, 1 insertion(+), 4 deletions(-)
--- linux-2.6.16-rc5-mm2-full/include/linux/fs.h.old 2006-03-03 18:15:14.000000000 +0100
+++ linux-2.6.16-rc5-mm2-full/include/linux/fs.h 2006-03-03 18:15:20.000000000 +0100
@@ -761,7 +761,6 @@
extern int posix_lock_file(struct file *, struct file_lock *);
extern int posix_lock_file_wait(struct file *, struct file_lock *);
extern int posix_unblock_lock(struct file *, struct file_lock *);
-extern int posix_locks_deadlock(struct file_lock *, struct file_lock *);
extern int flock_lock_file_wait(struct file *filp, struct file_lock *fl);
extern int __break_lease(struct inode *inode, unsigned int flags);
extern void lease_get_mtime(struct inode *, struct timespec *time);
--- linux-2.6.16-rc5-mm2-full/fs/locks.c.old 2006-03-03 18:15:31.000000000 +0100
+++ linux-2.6.16-rc5-mm2-full/fs/locks.c 2006-03-03 18:15:54.000000000 +0100
@@ -715,7 +715,7 @@
* from a broken NFS client. But broken NFS clients have a lot more to
* worry about than proper deadlock detection anyway... --okir
*/
-int posix_locks_deadlock(struct file_lock *caller_fl,
+static int posix_locks_deadlock(struct file_lock *caller_fl,
struct file_lock *block_fl)
{
struct list_head *tmp;
@@ -734,8 +734,6 @@
return 0;
}
-EXPORT_SYMBOL(posix_locks_deadlock);
-
/* Try to create a FLOCK lock on filp. We always insert new FLOCK locks
* at the head of the list, but that's secret knowledge known only to
* flock_lock_file and posix_lock_file.
next prev parent reply other threads:[~2006-03-04 12:15 UTC|newest]
Thread overview: 38+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-03-03 12:56 2.6.16-rc5-mm2 Andrew Morton
2006-03-03 15:26 ` 2.6.16-rc5-mm2: IPW_QOS: two remarks Adrian Bunk
2006-03-05 0:46 ` Andreas Happe
2006-03-07 17:06 ` Adrian Bunk
2006-03-17 19:14 ` John W. Linville
2006-03-18 17:47 ` [PATCH 2.6.16-rc6 1/1] ipw2200: Add Kconfig entries for QOS and Monitor mode Andreas Happe
2006-03-22 3:11 ` Zhu Yi
2006-03-03 16:08 ` 2.6.16-rc5-mm2 (mips compile fix) Jason Baron
2006-03-03 17:08 ` 2.6.16-rc5-mm2 Benoit Boissinot
2006-03-04 1:34 ` 2.6.16-rc5-mm2 Grant Coady
2006-03-05 6:26 ` 2.6.16-rc5-mm2 Andrew Morton
2006-03-05 7:24 ` 2.6.16-rc5-mm2 Mike Galbraith
2006-03-06 11:35 ` 2.6.16-rc5-mm2 Takashi Iwai
2006-03-05 12:34 ` 2.6.16-rc5-mm2 Antonino A. Daplas
2006-03-04 12:14 ` [-mm patch] drivers/acpi/bus.c: make struct acpi_sci_dir static Adrian Bunk
2006-03-04 12:14 ` [RFC: -mm patch] drivers/media/video/msp3400-kthreads.c: make 3 functions static Adrian Bunk
2006-03-04 12:14 ` [RFC: -mm patch] drivers/message/fusion/mptbase.c: make mpt_read_ioc_pg_3() static Adrian Bunk
2006-03-04 12:14 ` [-mm patch] kernel/futex.c: make futexfs_get_sb() static again Adrian Bunk
2006-03-06 14:44 ` David Howells
2006-03-04 12:14 ` [-mm patch] mm/bootmem.c: make bdata_list static Adrian Bunk
2006-03-04 12:14 ` [-mm patch] NFS: make 2 functions static Adrian Bunk
2006-03-04 12:14 ` Adrian Bunk [this message]
2006-03-04 17:29 ` 2.6.16-rc5-mm2 Mattia Dongili
2006-03-05 6:28 ` 2.6.16-rc5-mm2 Andrew Morton
2006-03-05 8:14 ` 2.6.16-rc5-mm2 Benoit Boissinot
2006-03-05 8:34 ` 2.6.16-rc5-mm2 Andrew Morton
2006-03-05 11:42 ` 2.6.16-rc5-mm2 Stefan Rompf
2006-03-06 15:22 ` 2.6.16-rc5-mm2 James Ketrenos
2006-03-05 22:54 ` 2.6.16-rc5-mm2 Dominik Karall
2006-03-07 5:43 ` 2.6.16-rc5-mm2 Andrew Morton
2006-03-07 10:43 ` 2.6.16-rc5-mm2 David Howells
2006-03-07 14:33 ` 2.6.16-rc5-mm2 Dominik Karall
2006-03-07 17:25 ` 2.6.16-rc5-mm2 john stultz
2006-03-08 1:13 ` 2.6.16-rc5-mm2 Andi Kleen
2006-03-06 8:45 ` 2.6.16-rc5-mm2 Cornelia Huck
2006-03-06 9:10 ` 2.6.16-rc5-mm2 compile error in urb.c Helge Hafting
2006-03-06 9:21 ` Andrew Morton
2006-03-06 12:17 ` Helge Hafting
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=20060304121457.GS9295@stusta.de \
--to=bunk@stusta.de \
--cc=akpm@osdl.org \
--cc=linux-kernel@vger.kernel.org \
/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