path: root/net
diff options
authorLinus Torvalds <torvalds@linux-foundation.org>2013-03-13 15:47:50 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2013-03-13 15:47:50 -0700
commitaea8b5d1e5c5482e7cdda849dc16d728f7080289 (patch)
tree56433efdf8b93a2ee431430234c3f10c933e28b9 /net
parent842d223f28c4a4a6fe34df2d613049d4e47446c1 (diff)
parentfa7614ddd6c2368b8cd54cc67ab4b767af0a2a50 (diff)
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace
Pull namespace bugfixes from Eric Biederman: "This tree includes a partial revert for "fs: Limit sys_mount to only request filesystem modules." When I added the new style module aliases to the filesystems I deleted the old ones. A bad move. It turns out that distributions like Arch linux use module aliases when constructing ramdisks. Which meant ultimately that an ext3 filesystem mounted with ext4 would not result in the ext4 module being put into the ramdisk. The other change in this tree adds a handful of filesystem module alias I simply failed to add the first time. Which inconvinienced a few folks using cifs. I don't want to inconvinience folks any longer than I have to so here are these trivial fixes." * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace: fs: Readd the fs module aliases. fs: Limit sys_mount to only request filesystem modules. (Part 3)
Diffstat (limited to 'net')
1 files changed, 1 insertions, 0 deletions
diff --git a/net/sunrpc/rpc_pipe.c b/net/sunrpc/rpc_pipe.c
index a0f48a51e14..a9129f8d707 100644
--- a/net/sunrpc/rpc_pipe.c
+++ b/net/sunrpc/rpc_pipe.c
@@ -1175,6 +1175,7 @@ static struct file_system_type rpc_pipe_fs_type = {
.kill_sb = rpc_kill_sb,
static void
init_once(void *foo)