use special macro for print time_t, cleanup in includes.

[fs/lustre-release.git] / lustre / include / linux / lvfs.h

diff --git a/lustre/include/linux/lvfs.h b/lustre/include/linux/lvfs.h
index 816925a..fffb4bd 100644 (file)
--- a/lustre/include/linux/lvfs.h
+++ b/lustre/include/linux/lvfs.h
@@ -33,6 +33,7 @@
 #include <linux/lvfs_linux.h>
 #else
 struct group_info { /* unused */ };
+#include <liblustre.h>
 #endif
 
 #define LLOG_LVFS
@@ -40,13 +41,14 @@ struct group_info { /* unused */ };
 /* simple.c */
 
 struct lvfs_ucred {
-        struct upcall_cache_entry *luc_uce;
-        __u32 luc_fsuid;
-        __u32 luc_fsgid;
-        __u32 luc_cap;
-        __u32 luc_suppgid1;
-        __u32 luc_suppgid2;
-        __u32 luc_umask;
+        __u32                   luc_uid;
+        __u32                   luc_gid;
+        __u32                   luc_fsuid;
+        __u32                   luc_fsgid;
+        __u32                   luc_cap;
+        __u32                   luc_umask;
+       struct group_info      *luc_ginfo;
+       struct md_identity     *luc_identity;
 };
 
 struct lvfs_callback_ops {
@@ -62,11 +64,7 @@ struct lvfs_run_ctxt {
         struct lvfs_ucred        luc;
         int                      ngroups;
         struct lvfs_callback_ops cb_ops;
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,4)
         struct group_info       *group_info;
-#else
-        struct group_info        group_info;
-#endif
 #ifdef OBD_CTXT_DEBUG
         __u32                    magic;
 #endif
@@ -82,6 +80,7 @@ struct lvfs_run_ctxt {
 
 struct dentry *simple_mkdir(struct dentry *dir, char *name, int mode, int fix);
 struct dentry *simple_mknod(struct dentry *dir, char *name, int mode, int fix);
+int lustre_rename(struct dentry *dir, char *oldname, char *newname);
 int lustre_fread(struct file *file, void *buf, int len, loff_t *off);
 int lustre_fwrite(struct file *file, const void *buf, int len, loff_t *off);
 int lustre_fsync(struct file *file);