Changeset 679 for GPL/trunk/include/linux/fs.h

Timestamp:

Mar 18, 2021, 8:57:36 PM (4 years ago)

Author:

David Azarewicz

Message:

Merge changes from Paul's uniaud32next branch.

Location:

GPL/trunk

Files:

• . (modified) (1 prop)
• include/linux/fs.h (modified) (9 diffs)

GPL/trunk/include/linux/fs.h

@@ -12 +12 @@
  */
 
+#include <linux/init.h>
 #include <linux/types.h>
 #include <linux/fcntl.h>
@@ -20 +21 @@
 #include <linux/dcache.h>
 #include <linux/vmalloc.h>
-#include <linux/tqueue.h>
+#include <linux/pid.h>
+#include <linux/err.h>
+#include <linux/workqueue.h>
 
 #define FALSE   0
@@ -43 +46 @@
 #define MAY_WRITE 2
 #define MAY_READ 4
-
-#define FMODE_READ 1
-#define FMODE_WRITE 2
 
 #define READ 0
@@ -167 +167 @@
          void * f_list;
         struct dentry           *f_dentry;
-        struct file_operations  *f_op;
+        const struct file_operations    *f_op;
+        struct inode            *f_inode;       /* cached value */
+        spinlock_t              f_lock;
         atomic_t                f_count;
         unsigned int            f_flags;
@@ -184 +186 @@
 
 struct inode {
-#ifdef TARGET_OS2
-        kdev_t                  i_rdev;
-        struct semaphore        i_sem;
-        union {
-                void            *generic_ip;
-        } u;
-
-#else
          void * i_hash;
          void * i_list;
@@ -227 +221 @@
                 void                            *generic_ip;
         } u;
-#endif
 };
 
@@ -237 +230 @@
         int (*read) (struct file *, char *, size_t, loff_t *);
         int (*write) (struct file *, const char *, size_t, loff_t *);
+        ssize_t (*read_iter) (struct kiocb *, struct iov_iter *);
+        ssize_t (*write_iter) (struct kiocb *, struct iov_iter *);
         int (*readdir) (struct file *, void *, filldir_t);
         unsigned int (*poll) (struct file *, struct poll_table_struct *);
-        int (*ioctl) (struct inode *, struct file *, unsigned int, unsigned long);
+        long (*unlocked_ioctl) (struct file *, unsigned int, unsigned long);
+        long (*compat_ioctl) (struct file *, unsigned int, unsigned long);
         int (*mmap) (struct file *, struct vm_area_struct *);
         int (*open) (struct inode *, struct file *);
@@ -259 +255 @@
 
 
-extern int register_chrdev(unsigned int, const char *, struct file_operations *);
+extern int register_chrdev(unsigned int, const char *, const struct file_operations *);
 extern int unregister_chrdev(unsigned int, const char *);
 
 extern int fasync_helper(int, struct file *, int, struct fasync_struct **);
-extern void kill_fasync(struct fasync_struct *, int, int);
-
-#define fops_get(x) (x)
-#define fops_put(x) do { ; } while (0)
+extern void kill_fasync(struct fasync_struct **, int, int);
+
+
+/* Alas, no aliases. Too much hassle with bringing module.h everywhere */
+#define fops_get(fops) \
+        (((fops) && try_module_get((fops)->owner) ? (fops) : NULL))
+#define fops_put(fops) \
+        do { if (fops) module_put((fops)->owner); } while(0)
+/*
+ * This one is to be used *ONLY* from ->open() instances.
+ * fops must be non-NULL, pinned down *and* module dependencies
+ * should be sufficient to pin the caller down as well.
+ */
+#define replace_fops(f, fops) \
+        do {    \
+                struct file *__file = (f); \
+                fops_put(__file->f_op); \
+        } while(0)
 
 #define minor(a) MINOR(a)
@@ -276 +286 @@
 #define nonseekable_open(i,f) 0
 
+struct kiocb {
+        struct file             *ki_filp;
+        loff_t                  ki_pos;
+        void (*ki_complete)(struct kiocb *iocb, long ret, long ret2);
+        void                    *private;
+        int                     ki_flags;
+};
+
+extern int stream_open(struct inode * inode, struct file * filp);
+
+/*
+ * flags in file.f_mode.  Note that FMODE_READ and FMODE_WRITE must correspond
+ * to O_WRONLY and O_RDWR via the strange trick in do_dentry_open()
+ */
+
+/* file is open for reading */
+#define FMODE_READ              (( fmode_t)0x1)
+/* file is open for writing */
+#define FMODE_WRITE             (( fmode_t)0x2)
+/* file is seekable */
+#define FMODE_LSEEK             (( fmode_t)0x4)
+/* file can be accessed using pread */
+#define FMODE_PREAD             (( fmode_t)0x8)
+/* file can be accessed using pwrite */
+#define FMODE_PWRITE            (( fmode_t)0x10)
+/* File is opened for execution with sys_execve / sys_uselib */
+#define FMODE_EXEC              (( fmode_t)0x20)
+/* File is opened with O_NDELAY (only set for block devices) */
+#define FMODE_NDELAY            (( fmode_t)0x40)
+/* File is opened with O_EXCL (only set for block devices) */
+#define FMODE_EXCL              (( fmode_t)0x80)
+/* File is opened using open(.., 3, ..) and is writeable only for ioctls
+   (specialy hack for floppy.c) */
+#define FMODE_WRITE_IOCTL       (( fmode_t)0x100)
+/* 32bit hashes as llseek() offset (for directories) */
+#define FMODE_32BITHASH         (( fmode_t)0x200)
+/* 64bit hashes as llseek() offset (for directories) */
+#define FMODE_64BITHASH         (( fmode_t)0x400)
+
+/* File needs atomic accesses to f_pos */
+#define FMODE_ATOMIC_POS        (( fmode_t)0x8000)
+
+/* File is stream-like */
+#define FMODE_STREAM            (( fmode_t)0x200000)
+
+static inline struct inode *file_inode(const struct file *f)
+{
+        return f->f_inode;
+}
+
 #endif /* _LINUX_FS_H */