The patch titled
fdtable: Provide free_fdtable() wrapper
has been added to the -mm tree. Its filename is
fdtable-provide-free_fdtable-wrapper.patch
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: fdtable: Provide free_fdtable() wrapper
From: Vadim Lobanov <vlobanov@xxxxxxxxxxxxx>
Christoph Hellwig has expressed concerns that the recent fdtable changes
expose the details of the RCU methodology used to release no-longer-used
fdtable structures to the rest of the kernel. The trivial patch below
addresses these concerns by introducing the appropriate free_fdtable()
calls, which simply wrap the release RCU usage. Since free_fdtable() is a
one-liner, it makes sense to promote it to an inline helper.
Signed-off-by: Vadim Lobanov <vlobanov@xxxxxxxxxxxxx>
Cc: Christoph Hellwig <hch@xxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
fs/file.c | 2 +-
include/linux/file.h | 5 +++++
kernel/exit.c | 2 +-
3 files changed, 7 insertions(+), 2 deletions(-)
diff -puN fs/file.c~fdtable-provide-free_fdtable-wrapper fs/file.c
--- a/fs/file.c~fdtable-provide-free_fdtable-wrapper
+++ a/fs/file.c
@@ -206,7 +206,7 @@ static int expand_fdtable(struct files_s
copy_fdtable(new_fdt, cur_fdt);
rcu_assign_pointer(files->fdt, new_fdt);
if (cur_fdt->max_fds > NR_OPEN_DEFAULT)
- call_rcu(&cur_fdt->rcu, free_fdtable_rcu);
+ free_fdtable(cur_fdt);
} else {
/* Somebody else expanded, so undo our attempt */
free_fdarr(new_fdt);
diff -puN include/linux/file.h~fdtable-provide-free_fdtable-wrapper include/linux/file.h
--- a/include/linux/file.h~fdtable-provide-free_fdtable-wrapper
+++ a/include/linux/file.h
@@ -80,6 +80,11 @@ extern int expand_files(struct files_str
extern void free_fdtable_rcu(struct rcu_head *rcu);
extern void __init files_defer_init(void);
+static inline void free_fdtable(struct fdtable *fdt)
+{
+ call_rcu(&fdt->rcu, free_fdtable_rcu);
+}
+
static inline struct file * fcheck_files(struct files_struct *files, unsigned int fd)
{
struct file * file = NULL;
diff -puN kernel/exit.c~fdtable-provide-free_fdtable-wrapper kernel/exit.c
--- a/kernel/exit.c~fdtable-provide-free_fdtable-wrapper
+++ a/kernel/exit.c
@@ -468,7 +468,7 @@ void fastcall put_files_struct(struct fi
fdt = files_fdtable(files);
if (fdt != &files->fdtab)
kmem_cache_free(files_cachep, files);
- call_rcu(&fdt->rcu, free_fdtable_rcu);
+ free_fdtable(fdt);
}
}
_
Patches currently in -mm which might be from vlobanov@xxxxxxxxxxxxx are
fdtable-provide-free_fdtable-wrapper.patch
fdtable-make-fdarray-and-fdsets-equal-in-size-slim.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
