From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1030438Ab2HWKtT (ORCPT ); Thu, 23 Aug 2012 06:49:19 -0400 Received: from mail-lb0-f174.google.com ([209.85.217.174]:37439 "EHLO mail-lb0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933890Ab2HWKra (ORCPT ); Thu, 23 Aug 2012 06:47:30 -0400 Message-Id: <20120823104725.758120342@openvz.org> User-Agent: quilt/0.48-1 Date: Thu, 23 Aug 2012 14:43:26 +0400 From: Cyrill Gorcunov To: linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org Cc: Al Viro , Alexey Dobriyan , Andrew Morton , Pavel Emelyanov , James Bottomley , Matthew Helsley , aneesh.kumar@linux.vnet.ibm.com, bfields@fieldses.org, Cyrill Gorcunov , Al Viro Subject: [patch 3/9] procfs: Add ability to plug in auxiliary fdinfo providers References: <20120823104323.040550004@openvz.org> Content-Disposition: inline; filename=seq-fdinfo-seq-ops-helpers-11 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This patch brings ability to print out auxiliary data associated with file in procfs interface /proc/pid/fdinfo/fd. In particular further patches make eventfd, evenpoll, signalfd and fsnotify to print additional information complete enough to restore these objects after checkpoint. To simplify the code we add show_fdinfo callback inside struct file_operations (as Al and Pavel are proposing). Signed-off-by: Cyrill Gorcunov CC: Pavel Emelyanov CC: Al Viro CC: Alexey Dobriyan CC: Andrew Morton CC: James Bottomley CC: "Aneesh Kumar K.V" CC: Alexey Dobriyan CC: Matthew Helsley CC: "J. Bruce Fields" CC: "Aneesh Kumar K.V" --- fs/proc/fd.c | 5 +++++ include/linux/fs.h | 3 +++ 2 files changed, 8 insertions(+) Index: linux-2.6.git/fs/proc/fd.c =================================================================== --- linux-2.6.git.orig/fs/proc/fd.c +++ linux-2.6.git/fs/proc/fd.c @@ -23,8 +23,13 @@ struct proc_fdinfo { static int seq_show(struct seq_file *m, void *v) { struct proc_fdinfo *fdinfo = container_of(m, struct proc_fdinfo, m); + seq_printf(m, "pos:\t%lli\nflags:\t0%o\n", (long long)fdinfo->fd_file->f_pos, fdinfo->f_flags); + + if (fdinfo->fd_file->f_op->show_fdinfo) + return fdinfo->fd_file->f_op->show_fdinfo(m, fdinfo->fd_file); + return 0; } Index: linux-2.6.git/include/linux/fs.h =================================================================== --- linux-2.6.git.orig/include/linux/fs.h +++ linux-2.6.git/include/linux/fs.h @@ -1775,6 +1775,8 @@ struct block_device_operations; #define HAVE_COMPAT_IOCTL 1 #define HAVE_UNLOCKED_IOCTL 1 +struct seq_file; + struct file_operations { struct module *owner; loff_t (*llseek) (struct file *, loff_t, int); @@ -1803,6 +1805,7 @@ struct file_operations { int (*setlease)(struct file *, long, struct file_lock **); long (*fallocate)(struct file *file, int mode, loff_t offset, loff_t len); + int (*show_fdinfo)(struct seq_file *m, struct file *f); }; struct inode_operations {