X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Finclude%2Flinux%2Flvfs.h;h=020e039518bf01d88014c2a2a9244f9c64846c87;hb=f12b088ace79fa518bdfc8bdb9b462b8165d715e;hp=17576c342ed4f0158b6045186cc82a1d7bf5067e;hpb=90d8e7fd28746a572c8de488222f5312fe927fc3;p=fs%2Flustre-release.git

diff --git a/lustre/include/linux/lvfs.h b/lustre/include/linux/lvfs.h
index 17576c3..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
 
@@ -103,14 +102,18 @@ int lustre_rename(struct dentry *dir, struct vfsmount *mnt, char *oldname,
 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