get rid of fget_light()

[~andy/linux] / include / linux / file.h

diff --git a/include/linux/file.h b/include/linux/file.h
index da84fa0f4579602d552812d82a95b061ccc7aaef..4d69123377a2b4e0a7869ba38cc91ceb4fd1c7b7 100644 (file)
--- a/include/linux/file.h
+++ b/include/linux/file.h
@@ -26,15 +26,45 @@ static inline void fput_light(struct file *file, int fput_needed)
                fput(file);
 }
 
+struct fd {
+       struct file *file;
+       unsigned int flags;
+};
+#define FDPUT_FPUT       1
+#define FDPUT_POS_UNLOCK 2
+
+static inline void fdput(struct fd fd)
+{
+       if (fd.flags & FDPUT_FPUT)
+               fput(fd.file);
+}
+
 extern struct file *fget(unsigned int fd);
-extern struct file *fget_light(unsigned int fd, int *fput_needed);
 extern struct file *fget_raw(unsigned int fd);
-extern struct file *fget_raw_light(unsigned int fd, int *fput_needed);
+extern unsigned long __fdget(unsigned int fd);
+extern unsigned long __fdget_raw(unsigned int fd);
+extern unsigned long __fdget_pos(unsigned int fd);
+
+static inline struct fd __to_fd(unsigned long v)
+{
+       return (struct fd){(struct file *)(v & ~3),v & 3};
+}
+
+static inline struct fd fdget(unsigned int fd)
+{
+       return __to_fd(__fdget(fd));
+}
+
+static inline struct fd fdget_raw(unsigned int fd)
+{
+       return __to_fd(__fdget_raw(fd));
+}
+
 extern int f_dupfd(unsigned int from, struct file *file, unsigned flags);
+extern int replace_fd(unsigned fd, struct file *file, unsigned flags);
 extern void set_close_on_exec(unsigned int fd, int flag);
 extern bool get_close_on_exec(unsigned int fd);
 extern void put_filp(struct file *);
-extern int alloc_fd(unsigned start, unsigned flags);
 extern int get_unused_fd_flags(unsigned flags);
 #define get_unused_fd() get_unused_fd_flags(0)
 extern void put_unused_fd(unsigned int fd);