From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932663AbaCQKlD (ORCPT ); Mon, 17 Mar 2014 06:41:03 -0400 Received: from mailhub.sw.ru ([195.214.232.25]:38923 "EHLO relay.sw.ru" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932348AbaCQKlB (ORCPT ); Mon, 17 Mar 2014 06:41:01 -0400 From: Andrey Vagin To: linux-kernel@vger.kernel.org Cc: criu@openvz.org, Andrey Vagin , Al Viro , Oleg Nesterov , Andrew Morton , Cyrill Gorcunov , Pavel Emelyanov Subject: [PATCH] proc: show mnt_id in fdinfo files Date: Mon, 17 Mar 2014 14:39:10 +0400 Message-Id: <1395052750-8525-1-git-send-email-avagin@openvz.org> X-Mailer: git-send-email 1.8.5.3 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Currently we don't have a way how to determing from which mount point file has been opened. This information is required for proper dumping and restoring file descriptos due to presence of mount namespaces. It's possible, that two file descriptors are opened using the same paths, but one fd references mount point from one namespace while the other fd -- from other namespace. Cc: Al Viro Cc: Oleg Nesterov Cc: Andrew Morton Cc: Cyrill Gorcunov Cc: Pavel Emelyanov Signed-off-by: Andrey Vagin --- fs/proc/fd.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/fs/proc/fd.c b/fs/proc/fd.c index 985ea88..0788d09 100644 --- a/fs/proc/fd.c +++ b/fs/proc/fd.c @@ -11,6 +11,7 @@ #include +#include "../mount.h" #include "internal.h" #include "fd.h" @@ -48,8 +49,9 @@ static int seq_show(struct seq_file *m, void *v) } if (!ret) { - seq_printf(m, "pos:\t%lli\nflags:\t0%o\n", - (long long)file->f_pos, f_flags); + seq_printf(m, "pos:\t%lli\nflags:\t0%o\nmnt_id:\t%i\n", + (long long)file->f_pos, f_flags, + real_mount(file->f_path.mnt)->mnt_id); if (file->f_op->show_fdinfo) ret = file->f_op->show_fdinfo(m, file); fput(file); -- 1.8.5.3