fedora core 6 1.2949 + vserver 2.2.0

[linux-2.6.git] / fs / hostfs / hostfs.h

diff --git a/fs/hostfs/hostfs.h b/fs/hostfs/hostfs.h
index d1f6c33..70543b1 100644 (file)
--- a/fs/hostfs/hostfs.h
+++ b/fs/hostfs/hostfs.h
@@ -3,7 +3,7 @@
 
 #include "os.h"
 
-/* These are exactly the same definitions as in fs.h, but the names are 
+/* These are exactly the same definitions as in fs.h, but the names are
  * changed so that this file can be included in both kernel and user files.
  */
 
@@ -16,9 +16,30 @@
 #define HOSTFS_ATTR_CTIME      64
 #define HOSTFS_ATTR_ATIME_SET  128
 #define HOSTFS_ATTR_MTIME_SET  256
+
+/* These two are unused by hostfs. */
 #define HOSTFS_ATTR_FORCE      512     /* Not a change, but a change it */
 #define HOSTFS_ATTR_ATTR_FLAG  1024
 
+/* If you are very careful, you'll notice that these two are missing:
+ *
+ * #define ATTR_KILL_SUID      2048
+ * #define ATTR_KILL_SGID      4096
+ *
+ * and this is because they were added in 2.5 development in this patch:
+ *
+ * http://linux.bkbits.net:8080/linux-2.5/
+ * cset@3caf4a12k4XgDzK7wyK-TGpSZ9u2Ww?nav=index.html
+ * |src/.|src/include|src/include/linux|related/include/linux/fs.h
+ *
+ * Actually, they are not needed by most ->setattr() methods - they are set by
+ * callers of notify_change() to notify that the setuid/setgid bits must be
+ * dropped.
+ * notify_change() will delete those flags, make sure attr->ia_valid & ATTR_MODE
+ * is on, and remove the appropriate bits from attr->ia_mode (attr is a
+ * "struct iattr *"). -BlaisorBlade
+ */
+
 struct hostfs_iattr {
        unsigned int    ia_valid;
        mode_t          ia_mode;
@@ -28,19 +49,18 @@ struct hostfs_iattr {
        struct timespec ia_atime;
        struct timespec ia_mtime;
        struct timespec ia_ctime;
-       unsigned int    ia_attr_flags;
 };
 
-extern int stat_file(const char *path, unsigned long long *inode_out, 
+extern int stat_file(const char *path, unsigned long long *inode_out,
                     int *mode_out, int *nlink_out, int *uid_out, int *gid_out,
-                    unsigned long long *size_out, struct timespec *atime_out, 
-                    struct timespec *mtime_out, struct timespec *ctime_out, 
+                    unsigned long long *size_out, struct timespec *atime_out,
+                    struct timespec *mtime_out, struct timespec *ctime_out,
                     int *blksize_out, unsigned long long *blocks_out);
 extern int access_file(char *path, int r, int w, int x);
 extern int open_file(char *path, int r, int w, int append);
-extern int file_type(const char *path, int *rdev);
+extern int file_type(const char *path, int *maj, int *min);
 extern void *open_dir(char *path, int *err_out);
-extern char *read_dir(void *stream, unsigned long long *pos, 
+extern char *read_dir(void *stream, unsigned long long *pos,
                      unsigned long long *ino_out, int *len_out);
 extern void close_file(void *stream);
 extern void close_dir(void *stream);
@@ -48,21 +68,22 @@ extern int read_file(int fd, unsigned long long *offset, char *buf, int len);
 extern int write_file(int fd, unsigned long long *offset, const char *buf,
                      int len);
 extern int lseek_file(int fd, long long offset, int whence);
-extern int file_create(char *name, int ur, int uw, int ux, int gr, 
+extern int fsync_file(int fd, int datasync);
+extern int file_create(char *name, int ur, int uw, int ux, int gr,
                       int gw, int gx, int or, int ow, int ox);
 extern int set_attr(const char *file, struct hostfs_iattr *attrs);
 extern int make_symlink(const char *from, const char *to);
 extern int unlink_file(const char *file);
 extern int do_mkdir(const char *file, int mode);
 extern int do_rmdir(const char *file);
-extern int do_mknod(const char *file, int mode, int dev);
+extern int do_mknod(const char *file, int mode, unsigned int major, unsigned int minor);
 extern int link_file(const char *from, const char *to);
 extern int do_readlink(char *file, char *buf, int size);
 extern int rename_file(char *from, char *to);
-extern int do_statfs(char *root, long *bsize_out, long long *blocks_out, 
-                    long long *bfree_out, long long *bavail_out, 
-                    long long *files_out, long long *ffree_out, 
-                    void *fsid_out, int fsid_size, long *namelen_out, 
+extern int do_statfs(char *root, long *bsize_out, long long *blocks_out,
+                    long long *bfree_out, long long *bavail_out,
+                    long long *files_out, long long *ffree_out,
+                    void *fsid_out, int fsid_size, long *namelen_out,
                     long *spare_out);
 
 #endif