X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Finclude%2Flinux%2Flvfs.h;h=020e039518bf01d88014c2a2a9244f9c64846c87;hb=3181280b226bdd1dfd4026e1fd70b1915caefc98;hp=335373af2ba58bfd35652c1b1556cce238565b77;hpb=6869932b552ac705f411de3362f01bd50c1f6f7d;p=fs%2Flustre-release.git

diff --git a/lustre/include/linux/lvfs.h b/lustre/include/linux/lvfs.h
index 335373a..020e039 100644
--- a/lustre/include/linux/lvfs.h
+++ b/lustre/include/linux/lvfs.h
@@ -26,7 +26,7 @@
  * GPL HEADER END
  */
 /*
- * Copyright  2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
  */
 /*
@@ -49,7 +49,6 @@
 #include <linux/lustre_compat25.h>
 #include <linux/lvfs_linux.h>
 #else
-struct group_info { /* unused */ };
 #include <liblustre.h>
 #endif
 
@@ -62,7 +61,7 @@ struct lvfs_ucred {
         __u32                   luc_gid;
         __u32                   luc_fsuid;
         __u32                   luc_fsgid;
-        __u32                   luc_cap;
+        cfs_kernel_cap_t        luc_cap;
         __u32                   luc_umask;
 	struct group_info      *luc_ginfo;
 	struct md_identity     *luc_identity;
@@ -96,21 +95,25 @@ struct lvfs_run_ctxt {
 #ifdef __KERNEL__
 
 struct dentry *simple_mkdir(struct dentry *dir, struct vfsmount *mnt, 
-                            char *name, int mode, int fix);
+                            const 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, struct vfsmount *mnt, 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);
-long l_readdir(struct file * file, struct list_head *dentry_list);
+long l_readdir(struct file * file, cfs_list_t *dentry_list);
+int l_notify_change(struct vfsmount *mnt, struct dentry *dchild,
+                    struct iattr *newattrs);
+int simple_truncate(struct dentry *dir, struct vfsmount *mnt,
+                               char *name, loff_t length);
 
 static inline void l_dput(struct dentry *de)
 {
         if (!de || IS_ERR(de))
                 return;
         //shrink_dcache_parent(de);
-        LASSERT(atomic_read(&de->d_count) > 0);
+        LASSERT(cfs_atomic_read(&de->d_count) > 0);
         dput(de);
 }
 
@@ -143,9 +146,9 @@ static inline struct dentry *ll_lookup_one_len(const char *fid_name,
 
 static inline void ll_sleep(int t)
 {
-        set_current_state(TASK_INTERRUPTIBLE);
-        schedule_timeout(t * HZ);
-        set_current_state(TASK_RUNNING);
+        cfs_set_current_state(CFS_TASK_INTERRUPTIBLE);
+        cfs_schedule_timeout(t * CFS_HZ);
+        cfs_set_current_state(CFS_TASK_RUNNING);
 }
 #endif