lkml.org 
[lkml]   [2006]   [Mar]   [4]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[RFC: -mm patch] fs/locks.c: make posix_locks_deadlock() static
    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.
    -
    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/

    \
     
     \ /
      Last update: 2006-03-04 13:18    [W:4.367 / U:0.084 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site