From d03dbed1fe6ba5a407d737aaaa4648739b23c821 Mon Sep 17 00:00:00 2001
From: David Howells <dhowells@redhat.com>
Date: Fri, 12 Apr 2013 01:42:56 +0100
Subject: [PATCH] --- yaml --- r: 370115 b: refs/heads/master c:
 c3bef7bcaaa7d9f6704fcd81a171c9f0c91a2259 h: refs/heads/master i:   370113:
 c9ef6d5e44911b01f9c10720f2292888925c12be   370111:
 984186f2f1bbe2e2cf489bb661c88f92c7cc10c2 v: v3

---
 [refs]                   | 2 +-
 trunk/fs/proc/fd.h       | 5 +++++
 trunk/fs/proc/internal.h | 5 -----
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index e2754e91c356..b05f09d9be2b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1dd704b6175f067781807ad4da1b878357dc9755
+refs/heads/master: c3bef7bcaaa7d9f6704fcd81a171c9f0c91a2259
diff --git a/trunk/fs/proc/fd.h b/trunk/fs/proc/fd.h
index cbb1d47deda8..7c047f256ae2 100644
--- a/trunk/fs/proc/fd.h
+++ b/trunk/fs/proc/fd.h
@@ -11,4 +11,9 @@ extern const struct inode_operations proc_fdinfo_inode_operations;
 
 extern int proc_fd_permission(struct inode *inode, int mask);
 
+static inline int proc_fd(struct inode *inode)
+{
+	return PROC_I(inode)->fd;
+}
+
 #endif /* __PROCFS_FD_H__ */
diff --git a/trunk/fs/proc/internal.h b/trunk/fs/proc/internal.h
index aaf2dd8c2b10..32d8f510d65c 100644
--- a/trunk/fs/proc/internal.h
+++ b/trunk/fs/proc/internal.h
@@ -94,11 +94,6 @@ static inline struct task_struct *get_proc_task(struct inode *inode)
 	return get_pid_task(proc_pid(inode), PIDTYPE_PID);
 }
 
-static inline int proc_fd(struct inode *inode)
-{
-	return PROC_I(inode)->fd;
-}
-
 static inline int task_dumpable(struct task_struct *task)
 {
 	int dumpable = 0;