The patch titled
fs/locks.c: make posix_locks_deadlock() static
has been removed from the -mm tree. Its filename is
fs-locksc-make-posix_locks_deadlock-static.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
Subject: fs/locks.c: make posix_locks_deadlock() static
From: Adrian Bunk <bunk@xxxxxxxxx>
We can now make posix_locks_deadlock() static.
Signed-off-by: Adrian Bunk <bunk@xxxxxxxxx>
Cc: Trond Myklebust <trond.myklebust@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
fs/locks.c | 4 +---
include/linux/fs.h | 1 -
2 files changed, 1 insertion(+), 4 deletions(-)
diff -puN fs/locks.c~fs-locksc-make-posix_locks_deadlock-static fs/locks.c
--- a/fs/locks.c~fs-locksc-make-posix_locks_deadlock-static
+++ a/fs/locks.c
@@ -703,7 +703,7 @@ EXPORT_SYMBOL(posix_test_lock);
* 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;
@@ -722,8 +722,6 @@ next_task:
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.
diff -puN include/linux/fs.h~fs-locksc-make-posix_locks_deadlock-static include/linux/fs.h
--- a/include/linux/fs.h~fs-locksc-make-posix_locks_deadlock-static
+++ a/include/linux/fs.h
@@ -776,7 +776,6 @@ extern int posix_lock_file_conf(struct f
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);
_
Patches currently in -mm which might be from bunk@xxxxxxxxx are
origin.patch
acpiphp-use-new-dock-driver.patch
drivers-acpi-scanc-make-acpi_bus_type-static.patch
the-scheduled-unexport-of-insert_resource.patch
git-dvb.patch
drivers-media-video-vivic-make-2-functions-static.patch
drivers-media-video-pwc-make-code-static.patch
git-gfs2.patch
make-drivers-scsi-pata_pcmciacpcmcia_remove_one-static.patch
ni5010-netcard-cleanup-fix.patch
git-ocfs2.patch
gregkh-pci-acpiphp-configure-_prt-v3-cleanup.patch
drivers-scsi-aic7xxx-possible-cleanups.patch
drivers-scsi-small-cleanups.patch
drivers-scsi-megaraidc-add-a-dummy-mega_create_proc_entry-for-proc_fs=y.patch
drivers-scsi-qla2xxx-make-some-functions-static.patch
drivers-scsi-qla2xxx-make-more-some-functions-static.patch
drivers-scsi-aic7xxx-aic79xx_corec-make-ahd_done_with_status-static.patch
drivers-scsi-aic7xxx-aic79xx_corec-make-ahd_match_scb-static.patch
drivers-scsi-aic7xxx-possible-cleanups-2.patch
usb-new-driver-for-cypress-cy7c63xxx-mirco-controllers-fix.patch
if-0-drivers-usb-input-hid-corechid_find_field_by_usage.patch
acx1xx-wireless-driver.patch
x86_64-unexport-ia32_sys_call_table.patch
fs-bufferc-possible-cleanups.patch
drivers-char-applicomc-proper-module_initexit.patch
kernel-sysc-cleanups.patch
kernel-sysc-cleanups-fix.patch
chardev-gpio-for-scx200-pc-8736x-replace-spinlocks-fix.patch
time-i386-clocksource-drivers.patch
drivers-ide-legacy-ide-csc-make-2-functions-static.patch
fbdev-cleanup-the-config_video_select-mess.patch
fbdev-remove-duplicate-includes.patch
fbdev-remove-unused-exports.patch
md-make-md_print_devices-static.patch
drivers-md-mdc-make-code-static.patch
slab-cache-shrinker-statistics.patch
i386-enable-4k-stacks-by-default.patch
mutex-subsystem-synchro-test-module.patch
drivers-char-ipmi-ipmi_msghandlerc-make-proc_ipmi_root-static.patch
drivers-message-i2o-iopc-unexport-i2o_msg_nop.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
