Minor bugfix to allow multiple networked operations:

[fs/lustre-release.git] / lustre / llite / symlink.c

diff --git a/lustre/llite/symlink.c b/lustre/llite/symlink.c
index 01484fd..7b414fc 100644 (file)
--- a/lustre/llite/symlink.c
+++ b/lustre/llite/symlink.c
@@ -26,35 +26,35 @@
 #include <linux/stat.h>
 #include <linux/locks.h>
 #include <linux/obd_support.h> /* for ENTRY and EXIT only */
-#include <linux/obdfs.h>
+#include <linux/lustre_light.h>
 
-static int obdfs_fast_readlink(struct dentry *dentry, char *buffer, int buflen)
+static int ll_fast_readlink(struct dentry *dentry, char *buffer, int buflen)
 {
-        char *s = obdfs_i2info(dentry->d_inode)->oi_inline;
+        char *s = ll_i2info(dentry->d_inode)->lli_inline;
         return vfs_readlink(dentry, buffer, buflen, s);
 }
 
-static int obdfs_fast_follow_link(struct dentry *dentry, struct nameidata *nd)
+static int ll_fast_follow_link(struct dentry *dentry, struct nameidata *nd)
 {
-        char *s = obdfs_i2info(dentry->d_inode)->oi_inline;
+        char *s = ll_i2info(dentry->d_inode)->lli_inline;
         return vfs_follow_link(nd, s); 
 }
 
-extern int obdfs_setattr(struct dentry *de, struct iattr *attr);
-struct inode_operations obdfs_fast_symlink_inode_operations = {
-        readlink:       obdfs_fast_readlink,
-        follow_link:    obdfs_fast_follow_link,
-       setattr:        obdfs_setattr
+extern int ll_setattr(struct dentry *de, struct iattr *attr);
+struct inode_operations ll_fast_symlink_inode_operations = {
+        readlink:       ll_fast_readlink,
+        follow_link:    ll_fast_follow_link,
+       setattr:        ll_setattr
 };
 
-static int obdfs_readlink(struct dentry *dentry, char *buffer, int buflen)
+static int ll_readlink(struct dentry *dentry, char *buffer, int buflen)
 {
         struct page *page = NULL;
         int res;
 
         ENTRY;
         OIDEBUG(dentry->d_inode);
-        page = obdfs_getpage(dentry->d_inode, 0, 0, 0);
+        page = ll_getpage(dentry->d_inode, 0, 0, 0);
         /* PDEBUG(page, "readlink"); */
         if (!page) {
                 EXIT;
@@ -64,9 +64,9 @@ static int obdfs_readlink(struct dentry *dentry, char *buffer, int buflen)
         page_cache_release(page);
         EXIT;
         return res;
-} /* obdfs_readlink */
+} /* ll_readlink */
 
-static int obdfs_follow_link(struct dentry * dentry,
+static int ll_follow_link(struct dentry * dentry,
                              struct nameidata *nd)
 {
         struct page *page = NULL;
@@ -74,7 +74,7 @@ static int obdfs_follow_link(struct dentry * dentry,
 
         ENTRY;
         OIDEBUG(dentry->d_inode);
-        page = obdfs_getpage(dentry->d_inode, 0, 0, 0);
+        page = ll_getpage(dentry->d_inode, 0, 0, 0);
         /* PDEBUG(page, "follow_link"); */
         if (!page) {
                 dput(nd->dentry);
@@ -87,8 +87,8 @@ static int obdfs_follow_link(struct dentry * dentry,
         return res;
 }
 
-struct inode_operations obdfs_symlink_inode_operations = {
-        readlink:       obdfs_readlink,
-        follow_link:    obdfs_follow_link,
-       setattr:        obdfs_setattr
+struct inode_operations ll_symlink_inode_operations = {
+        readlink:       ll_readlink,
+        follow_link:    ll_follow_link,
+       setattr:        ll_setattr
 };