[CRIU] [crtools-bot for Cyrill Gorcunov ] files: Rename pop_fmap_fd to pull_fmap_fd

Cyrill Gorcunov gorcunov at openvz.org
Tue Feb 28 10:13:47 EST 2012


The commit is pushed to "master" and will appear on git://github.com/cyrillos/crtools.git
------>
commit 4d3b3e8166802531aea32b8b2954d4339c2e976a
Author: Cyrill Gorcunov <gorcunov at openvz.org>
Date:   Wed Feb 22 16:53:22 2012 +0400

    files: Rename pop_fmap_fd to pull_fmap_fd
    
    The function has nothing to do with "pop" operation,
    it rather "pull"s descriptor out of list. Name it so.
    
    Signed-off-by: Cyrill Gorcunov <gorcunov at openvz.org>
    Acked-by: Pavel Emelyanov <xemul at parallels.com>
---
 files.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/files.c b/files.c
index 7212c43..73be79f 100644
--- a/files.c
+++ b/files.c
@@ -491,7 +491,7 @@ err:
 	return err;
 }
 
-static struct fmap_fd *pop_fmap_fd(int pid, unsigned long start)
+static struct fmap_fd *pull_fmap_fd(int pid, unsigned long start)
 {
 	struct fmap_fd **p, *r;
 
@@ -514,7 +514,7 @@ static struct fmap_fd *pop_fmap_fd(int pid, unsigned long start)
 
 int try_fixup_file_map(int pid, struct vma_entry *vma_entry, int fd)
 {
-	struct fmap_fd *fmap_fd = pop_fmap_fd(pid, vma_entry->start);
+	struct fmap_fd *fmap_fd = pull_fmap_fd(pid, vma_entry->start);
 
 	if (fmap_fd) {
 		pr_info("%d: Fixing %lx vma to %d fd\n",


More information about the CRIU mailing list