2013-10-30 20:23:05

by Cyrill Gorcunov

[permalink] [raw]
Subject: [patch 6/6] procfs: Drop legacy show_fdinfo file operation

All former users of show_fdinfo are converted to sequential
output engine thus we don't need it anymore.

Signed-off-by: Cyrill Gorcunov <[email protected]>
Cc: Pavel Emelyanov <[email protected]>
Cc: Oleg Nesterov <[email protected]>
Cc: Andrey Vagin <[email protected]>
Cc: Al Viro <[email protected]>
Cc: Alexey Dobriyan <[email protected]>
Cc: James Bottomley <[email protected]>
Cc: "Aneesh Kumar K.V" <[email protected]>
Cc: Alexey Dobriyan <[email protected]>
Cc: Matthew Helsley <[email protected]>
Cc: "J. Bruce Fields" <[email protected]>
Cc: "Aneesh Kumar K.V" <[email protected]>
Cc: Tvrtko Ursulin <[email protected]>
Cc: Andrew Morton <[email protected]>
---
fs/proc/fd.c | 5 -----
include/linux/fs.h | 1 -
2 files changed, 6 deletions(-)

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
@@ -79,11 +79,6 @@ static int seq_show(struct seq_file *m,

seq_printf(m, "pos:\t%lli\nflags:\t0%o\n",
(long long)info->f_file->f_pos, info->f_flags);
-
- /* Legacy interface */
- if (info->f_file->f_op->show_fdinfo)
- return info->f_file->f_op->show_fdinfo(m, info->f_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
@@ -1551,7 +1551,6 @@ 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 seq_operations *fdinfo_ops;
};