DEVEL15-cfileopen-cleanup-20090514

LICENSE IPL10

make disconnected work again. also, use static_inline macro consistently

(cherry picked from commit 8a2fcaa8f45c36a80c574a7e903e71041bbd53cc)

diff --git a/src/afs/afs_chunkops.h b/src/afs/afs_chunkops.h
index 05f3ff798125e80c001ce513d957ab8325bf0987..7804a584081017fa166a23e463824efa9d16f0fe 100644 (file)
--- a/src/afs/afs_chunkops.h
+++ b/src/afs/afs_chunkops.h
@@ -96,17 +96,17 @@ struct afs_cacheOps {
 
 /* These memcpys should get optimised to simple assignments when afs_dcache_id_t 
  * is simple */
-static inline void afs_copy_inode(afs_dcache_id_t *dst, afs_dcache_id_t *src) {
+static_inline void afs_copy_inode(afs_dcache_id_t *dst, afs_dcache_id_t *src) {
     memcpy(dst, src, sizeof(afs_dcache_id_t));
 }
 
-static inline void afs_reset_inode(afs_dcache_id_t *i) {
+static_inline void afs_reset_inode(afs_dcache_id_t *i) {
     memset(i, 0, sizeof(afs_dcache_id_t));
 }
 
 /* We need to have something we can output as the 'inode' for fstrace calls. 
  * This is a hack */
-static inline int afs_inode2trace(afs_dcache_id_t *i) {
+static_inline int afs_inode2trace(afs_dcache_id_t *i) {
     return i->mem;
 }
 

diff --git a/src/afs/afs_disconnected.c b/src/afs/afs_disconnected.c
index 716dfadfd4c9dac2b6e49d2b737b96070cdf476d..4755ff05c1809514aa15eece19a014254c24f42b 100644 (file)
--- a/src/afs/afs_disconnected.c
+++ b/src/afs/afs_disconnected.c
@@ -699,7 +699,7 @@ int afs_ProcessOpCreate(struct vcache *avc, struct vrequest *areq,
            return ENOMEM;
        }
        ObtainReadLock(&tdc->lock);
-       tfile = afs_CFileOpen(tdc->f.inode);
+       tfile = afs_CFileOpen(&tdc->f.inode);
        code = afs_CFileRead(tfile, 0, ttargetName, tlen);
        ttargetName[tlen-1] = '\0';
        afs_CFileClose(tfile);