[Ocfs2-commits] manish commits r991 - trunk/src
svn-commits at oss.oracle.com
svn-commits at oss.oracle.com
Wed Jun 2 20:43:24 CDT 2004
Author: manish
Date: 2004-06-02 19:43:22 -0500 (Wed, 02 Jun 2004)
New Revision: 991
Modified:
trunk/src/namei.c
Log:
Remove unnecessary casts, some unnecessary assignments
Modified: trunk/src/namei.c
===================================================================
--- trunk/src/namei.c 2004-06-03 00:40:56 UTC (rev 990)
+++ trunk/src/namei.c 2004-06-03 00:43:22 UTC (rev 991)
@@ -69,13 +69,13 @@
#endif
{
int status;
- ocfs_file_entry *fe = NULL;
+ ocfs_file_entry *fe;
struct buffer_head *fe_bh = NULL, *dirent_bh = NULL;
struct inode *inode = NULL;
struct super_block *sb = dir->i_sb;
struct dentry *ret;
ocfs_super *osb = OCFS_SB(sb);
- struct ocfs2_dir_entry *dirent = NULL;
+ struct ocfs2_dir_entry *dirent;
LOG_ENTRY_ARGS ("(0x%p, 0x%p, '%*s')\n", dir, dentry,
dentry->d_name.len, dentry->d_name.name);
@@ -89,12 +89,11 @@
LOG_TRACE_ARGS("about to call find_files_on_disk with inode=%p\n",
dir);
- inode = NULL; // no inode yet
status = ocfs_find_files_on_disk (osb, dentry, &fe_bh, dir, inode, 1, &dirent_bh, &dirent);
if (status < 0)
goto bail_add;
- fe = (ocfs_file_entry *) OCFS_BH_GET_DATA_READ(fe_bh); /* read */
+ fe = OCFS_BH_GET_DATA_READ(fe_bh);
if (!IS_VALID_FILE_ENTRY(fe)) {
printk("ocfs2: invalid file entry! parent=%llu, name='%*s'\n",
GET_INODE_FEOFF(dir), dentry->d_name.len,
@@ -197,7 +196,7 @@
goto leave;
}
- fe = (ocfs_file_entry *) OCFS_BH_GET_DATA_READ(new_fe_bh); /* read */
+ fe = OCFS_BH_GET_DATA_READ(new_fe_bh);
ocfs_populate_inode (inode, fe, mode, 1);
insert_inode_hash (inode);
@@ -228,7 +227,7 @@
LOG_ERROR_STATUS(status);
goto leave;
}
- de = (struct ocfs2_dir_entry *) OCFS_BH_GET_DATA_WRITE(newdirbh); /* write */
+ de = OCFS_BH_GET_DATA_WRITE(newdirbh);
de->inode = cpu_to_le64(file_off);
de->name_len = 1;
de->rec_len = cpu_to_le16(OCFS_DIR_REC_LEN(de->name_len));
@@ -255,7 +254,7 @@
LOG_ERROR_STATUS(status);
goto leave;
}
- fe = (ocfs_file_entry *) OCFS_BH_GET_DATA_WRITE(parent_fe_bh); /* write */
+ fe = OCFS_BH_GET_DATA_WRITE(parent_fe_bh);
fe->link_cnt++;
OCFS_BH_PUT_DATA(parent_fe_bh);
fe = NULL;
@@ -350,7 +349,7 @@
goto leave;
}
- fe = (ocfs_file_entry *) OCFS_BH_GET_DATA_WRITE(*new_fe_bh); /* write */
+ fe = OCFS_BH_GET_DATA_WRITE(*new_fe_bh);
memset (fe, 0, osb->sect_size);
inode->i_ino = ino_from_off(osb->sb, bitmapOffset);
fe->this_sector = bitmapOffset;
@@ -617,7 +616,7 @@
* here if we set the modify bit on this buffer, but haven't
* journal_dirtied it yet. Otherwise, it'll stay modified even
* after the abort_trans. */
- fe = (ocfs_file_entry *) OCFS_BH_GET_DATA_WRITE(fe_bh); /* write */
+ fe = OCFS_BH_GET_DATA_WRITE(fe_bh);
if (S_ISDIR (inode->i_mode))
fe->link_cnt = 0;
else
@@ -662,7 +661,7 @@
LOG_ERROR_STATUS(status);
goto leave;
}
- dirfe = (ocfs_file_entry *) OCFS_BH_GET_DATA_WRITE(parent_node_bh);
+ dirfe = OCFS_BH_GET_DATA_WRITE(parent_node_bh);
dirfe->link_cnt--;
OCFS_BH_PUT_DATA(parent_node_bh);
status = ocfs_journal_dirty(handle, fe_bh);
@@ -1037,7 +1036,7 @@
* away first */
if (new_de) {
/* TODO: change this block to the ext3-style orphan model */
- newfe = (ocfs_file_entry *) OCFS_BH_GET_DATA_READ(newfe_bh); /* read */
+ newfe = OCFS_BH_GET_DATA_READ(newfe_bh);
if (newfe->attribs & OCFS_ATTRIB_DIRECTORY)
newfe_flags = FLAG_DIR;
newfe_flags |= FLAG_FILE_DELETE;
@@ -1076,7 +1075,7 @@
* here if we set the modify bit on this buffer, but haven't
* journal_dirtied it yet. Otherwise, it'll stay modified even
* after the abort_trans. */
- newfe = (ocfs_file_entry *) OCFS_BH_GET_DATA_WRITE(newfe_bh); /* write */
+ newfe = OCFS_BH_GET_DATA_WRITE(newfe_bh);
if (S_ISDIR (new_inode->i_mode) && !empty_dir(new_inode)) {
status = -ENOTEMPTY;
OCFS_BH_PUT_DATA(newfe_bh);
@@ -1129,7 +1128,7 @@
LOG_ERROR_STATUS (status);
goto finally;
}
- OCFS_BH_GET_DATA_WRITE(new_de_bh); /* write */
+ OCFS_BH_GET_DATA_WRITE(new_de_bh);
new_de->inode = le64_to_cpu(GET_INODE_FEOFF(old_inode));
new_de->file_type = old_de->file_type;
new_dir->i_version++;
@@ -1174,7 +1173,7 @@
// BAD
goto bail;
}
- OCFS_BH_GET_DATA_WRITE(old_inode_de_bh); /* write */
+ OCFS_BH_GET_DATA_WRITE(old_inode_de_bh);
PARENT_INO(old_inode_de_bh->b_data) = le64_to_cpu(GET_INODE_FEOFF(new_dir));
OCFS_BH_PUT_DATA(old_inode_de_bh);
status = ocfs_journal_dirty(handle, old_inode_de_bh);
@@ -1334,7 +1333,7 @@
goto abort_trans;
}
- fe = (ocfs_file_entry *) OCFS_BH_GET_DATA_READ(new_fe_bh); /* read */
+ fe = OCFS_BH_GET_DATA_READ(new_fe_bh);
file_off = fe->this_sector;
OCFS_BH_PUT_DATA(new_fe_bh);
fe = NULL;
@@ -1350,7 +1349,7 @@
}
inode->i_rdev = OCFS_NODEV;
- fe = (ocfs_file_entry *) OCFS_BH_GET_DATA_READ(new_fe_bh); /* read */
+ fe = OCFS_BH_GET_DATA_READ(new_fe_bh);
ocfs_populate_inode (inode, fe, S_IFLNK | S_IRWXUGO, 1);
OCFS_BH_PUT_DATA(new_fe_bh);
fe = NULL;
@@ -1486,7 +1485,7 @@
/* create next block */
status = ocfs_journal_access(handle, bh, OCFS_JOURNAL_ACCESS_WRITE);
- buf = OCFS_BH_GET_DATA_WRITE(bh); /* write */
+ buf = OCFS_BH_GET_DATA_WRITE(bh);
de = (struct ocfs2_dir_entry *) bh->b_data;
de->inode = 0;
de->rec_len = le16_to_cpu(sb->s_blocksize);
@@ -1497,7 +1496,7 @@
/* update the parent file entry file size */
status = ocfs_journal_access(handle, parent_fe_bh, OCFS_JOURNAL_ACCESS_WRITE);
- buf = OCFS_BH_GET_DATA_WRITE(parent_fe_bh); /* write */
+ buf = OCFS_BH_GET_DATA_WRITE(parent_fe_bh);
fe = (ocfs_file_entry *)buf;
fe->file_size = dir->i_size;
OCFS_BH_PUT_DATA(parent_fe_bh);
@@ -1505,14 +1504,14 @@
status = ocfs_journal_dirty(handle, parent_fe_bh);
} else {
/* move to next block */
- buf = OCFS_BH_GET_DATA_READ(bh); /* read */
+ buf = OCFS_BH_GET_DATA_READ(bh);
de = (struct ocfs2_dir_entry *) bh->b_data;
OCFS_BH_PUT_DATA(bh);
buf = NULL;
}
}
- buf = OCFS_BH_GET_DATA_READ(bh); /* read */
+ buf = OCFS_BH_GET_DATA_READ(bh);
if (!ocfs_check_dir_entry (dir, de, bh, offset)) {
retval = -ENOENT;
goto bail;
@@ -1526,7 +1525,7 @@
OCFS_BH_PUT_DATA(bh);
buf = NULL;
status = ocfs_journal_access(handle, bh, OCFS_JOURNAL_ACCESS_WRITE);
- buf = OCFS_BH_GET_DATA_WRITE(bh); /* write */
+ buf = OCFS_BH_GET_DATA_WRITE(bh);
/* By now the buffer is marked for journaling */
offset += le16_to_cpu(de->rec_len);
if (le64_to_cpu(de->inode)) {
@@ -1565,7 +1564,6 @@
bail:
if (buf)
OCFS_BH_PUT_DATA(bh);
- buf = NULL;
brelse (bh);
return retval;
}
@@ -1582,7 +1580,7 @@
i = 0;
pde = NULL;
- de = (struct ocfs2_dir_entry *) OCFS_BH_GET_DATA_READ(bh); /* read */
+ de = (struct ocfs2_dir_entry *) OCFS_BH_GET_DATA_READ(bh);
while (i < bh->b_size) {
if (!ocfs_check_dir_entry(dir, de, bh, i)) {
OCFS_BH_PUT_DATA(bh);
@@ -1596,7 +1594,7 @@
status = -EIO;
goto bail;
}
- OCFS_BH_GET_DATA_WRITE(bh); /* write */
+ OCFS_BH_GET_DATA_WRITE(bh);
if (pde)
pde->rec_len = cpu_to_le16(le16_to_cpu(pde->rec_len) +
le16_to_cpu(de->rec_len));
@@ -1632,7 +1630,7 @@
int namelen = dentry->d_name.len;
int ret = 0;
- de = (struct ocfs2_dir_entry *) OCFS_BH_GET_DATA_READ(bh); /* read */
+ de = OCFS_BH_GET_DATA_READ(bh);
dlimit = (char *)de + dir->i_sb->s_blocksize;
while ((char *) de < dlimit) {
/* this code is executed quadratically often */
@@ -1829,7 +1827,7 @@
if (err < 0)
goto bail;
- fe = (ocfs_file_entry *) OCFS_BH_GET_DATA_WRITE(bh);
+ fe = OCFS_BH_GET_DATA_WRITE(bh);
fe->link_cnt++;
inode->i_nlink = fe->link_cnt;
inode->i_ctime = CURRENT_TIME;
More information about the Ocfs2-commits
mailing list