[Ocfs2-commits] mfasheh commits r1736 - trunk/src

[svn-commits at oss.oracle.com]

Author: mfasheh
Date: 2004-12-30 18:47:47 -0600 (Thu, 30 Dec 2004)
New Revision: 1736

Modified:
   trunk/src/namei.c
   trunk/src/ocfs2_fs.h
   trunk/src/symlink.c
Log:
* cleanup the i_symlink declaration



Modified: trunk/src/namei.c
===================================================================
--- trunk/src/namei.c	2004-12-30 23:27:17 UTC (rev 1735)
+++ trunk/src/namei.c	2004-12-31 00:47:47 UTC (rev 1736)
@@ -1587,7 +1587,7 @@
 		inode->i_blocks = (newsize + sb->s_blocksize - 1) >> sb->s_blocksize_bits;
 	} else {
 		inode->i_op = &ocfs_fast_symlink_inode_operations;
-		memcpy((char *) &fe->id2.i_symlink, symname, l);
+		memcpy((char *) fe->id2.i_symlink, symname, l);
 		i_size_write(inode, newsize);
 		inode->i_blocks = 0;
 	}

Modified: trunk/src/ocfs2_fs.h
===================================================================
--- trunk/src/ocfs2_fs.h	2004-12-30 23:27:17 UTC (rev 1735)
+++ trunk/src/ocfs2_fs.h	2004-12-31 00:47:47 UTC (rev 1736)
@@ -383,7 +383,7 @@
 		ocfs2_local_alloc i_lab;
 		ocfs2_chain_list  i_chain;
 		ocfs2_extent_list i_list;
-		__u8              i_symlink;
+		__u8              i_symlink[0];
 	} id2;
 /* Actual on-disk size is one block */
 } ocfs2_dinode;

Modified: trunk/src/symlink.c
===================================================================
--- trunk/src/symlink.c	2004-12-30 23:27:17 UTC (rev 1735)
+++ trunk/src/symlink.c	2004-12-31 00:47:47 UTC (rev 1736)
@@ -210,7 +210,7 @@
 	}
 
 	fe = (ocfs2_dinode *) (*bh)->b_data;
-	link = (char *) &fe->id2.i_symlink;
+	link = (char *) fe->id2.i_symlink;
 bail:
 	LOG_EXIT_STATUS(status);