[Ocfs2-commits] jlbec commits r912 - in trunk/src: . inc
svn-commits at oss.oracle.com
svn-commits at oss.oracle.com
Wed May 12 14:55:30 CDT 2004
Author: jlbec
Date: 2004-05-12 13:55:28 -0500 (Wed, 12 May 2004)
New Revision: 912
Modified:
trunk/src/dcache.c
trunk/src/dir.c
trunk/src/file.c
trunk/src/inc/ocfs.h
trunk/src/inode.c
trunk/src/namei.c
trunk/src/super.c
trunk/src/symlink.c
Log:
Rename OCFS_GENERIC_SB_P() to OCFS_SB() like all sane people.
Modified: trunk/src/dcache.c
===================================================================
--- trunk/src/dcache.c 2004-05-11 01:12:05 UTC (rev 911)
+++ trunk/src/dcache.c 2004-05-12 18:55:28 UTC (rev 912)
@@ -55,7 +55,7 @@
if (inode == NULL)
goto bail;
- osb = OCFS_GENERIC_SB_P(inode->i_sb);
+ osb = OCFS_SB(inode->i_sb);
OCFS_ASSERT(osb);
Modified: trunk/src/dir.c
===================================================================
--- trunk/src/dir.c 2004-05-11 01:12:05 UTC (rev 911)
+++ trunk/src/dir.c 2004-05-12 18:55:28 UTC (rev 912)
@@ -57,7 +57,7 @@
pos = filp->f_pos;
sb = inode->i_sb;
- osb = OCFS_GENERIC_SB_P(sb);
+ osb = OCFS_SB(sb);
if (!osb) {
LOG_TRACE_STR ("Invalid OSB");
Modified: trunk/src/file.c
===================================================================
--- trunk/src/file.c 2004-05-11 01:12:05 UTC (rev 911)
+++ trunk/src/file.c 2004-05-12 18:55:28 UTC (rev 912)
@@ -100,7 +100,7 @@
LOG_ENTRY_ARGS ("(0x%p, 0x%p, '%*s')\n", inode, file,
file->f_dentry->d_name.len, file->f_dentry->d_name.name);
- osb = OCFS_GENERIC_SB_P(inode->i_sb);
+ osb = OCFS_SB(inode->i_sb);
if (osb->osb_flags & OCFS_OSB_FLAGS_SHUTDOWN) {
LOG_ERROR_STR ("Volume has been shutdown");
@@ -277,7 +277,7 @@
if (file->private_data)
ofile = (ocfs_file *) file->private_data;
- osb = OCFS_GENERIC_SB_P(inode->i_sb);
+ osb = OCFS_SB(inode->i_sb);
/* dir */
if (S_ISDIR (inode->i_mode)) {
@@ -387,7 +387,7 @@
int err = 0;
journal_t *journal;
struct inode *inode = dentry->d_inode;
- ocfs_super *osb = OCFS_GENERIC_SB_P(inode->i_sb);
+ ocfs_super *osb = OCFS_SB(inode->i_sb);
LOG_ENTRY_ARGS ("(0x%p, 0x%p, %d, '%*s')\n", file, dentry, datasync,
dentry->d_name.len, dentry->d_name.name);
@@ -564,7 +564,7 @@
goto bail;
}
- osb = OCFS_GENERIC_SB_P(inode->i_sb);
+ osb = OCFS_SB(inode->i_sb);
if (osb->osb_flags & OCFS_OSB_FLAGS_SHUTDOWN) {
LOG_TRACE_STR ("Volume has already started shutdown");
@@ -721,7 +721,7 @@
goto bail;
}
- osb = OCFS_GENERIC_SB_P(inode->i_sb);
+ osb = OCFS_SB(inode->i_sb);
if (filp->f_flags & O_DIRECT) {
/* anything special for o_direct? */
@@ -1199,7 +1199,7 @@
LOG_ENTRY_ARGS ("(0x%p, '%*s')\n", dentry,
dentry->d_name.len, dentry->d_name.name);
- osb = OCFS_GENERIC_SB_P(inode->i_sb);
+ osb = OCFS_SB(inode->i_sb);
if (!dentry->d_parent || !dentry->d_parent->d_inode) {
LOG_ERROR_STR ("bad inode or root inode");
@@ -1375,7 +1375,7 @@
if (inode == NULL || !OCFS_I(inode)->open_hndl_cnt)
goto bail;
- osb = OCFS_GENERIC_SB_P(inode->i_sb);
+ osb = OCFS_SB(inode->i_sb);
if (inode->i_ino == OCFS_ROOT_INODE_NUMBER)
goto bail;
Modified: trunk/src/inc/ocfs.h
===================================================================
--- trunk/src/inc/ocfs.h 2004-05-11 01:12:05 UTC (rev 911)
+++ trunk/src/inc/ocfs.h 2004-05-12 18:55:28 UTC (rev 912)
@@ -968,7 +968,7 @@
#else
#define OCFS_GENERIC_SB_MEMBER(sb) ((sb)->u.generic_sbp)
#endif
-#define OCFS_GENERIC_SB_P(sb) ((ocfs_super *)OCFS_GENERIC_SB_MEMBER(sb))
+#define OCFS_SB(sb) ((ocfs_super *)OCFS_GENERIC_SB_MEMBER(sb))
extern __u32 debug_context;
extern __u32 debug_level;
@@ -2417,7 +2417,7 @@
if (!inode)
return;
- osb = OCFS_GENERIC_SB_P(inode->i_sb);
+ osb = OCFS_SB(inode->i_sb);
if (inode->i_ino == OCFS_ROOT_INODE_NUMBER)
is_root = 1;
Modified: trunk/src/inode.c
===================================================================
--- trunk/src/inode.c 2004-05-11 01:12:05 UTC (rev 911)
+++ trunk/src/inode.c 2004-05-12 18:55:28 UTC (rev 912)
@@ -357,7 +357,7 @@
LOG_ENTRY_ARGS ("(0x%p, %u, size:%llu)\n", inode, mode, fe->file_size);
sb = inode->i_sb;
- osb = OCFS_GENERIC_SB_P(sb);
+ osb = OCFS_SB(sb);
offset = fe->this_sector;
if (!IS_VALID_FILE_ENTRY(fe)) {
@@ -490,7 +490,7 @@
goto bail;
}
sb = inode->i_sb;
- osb = OCFS_GENERIC_SB_P(sb);
+ osb = OCFS_SB(sb);
if (!args) {
LOG_ERROR_STR("bad inode args");
@@ -642,7 +642,7 @@
LOG_ENTRY_ARGS ("(0x%p, inode_i_ino=%lu)\n", inode, inode->i_ino);
LOG_TRACE_ARGS ("put_inode: count=%d\n", atomic_read(&inode->i_count));
- osb = OCFS_GENERIC_SB_P(inode->i_sb);
+ osb = OCFS_SB(inode->i_sb);
/* Ok, if after this iput we would be the last holder of the
* root inode, then we know we're unmounting so just dump it
@@ -692,7 +692,7 @@
GET_INODE_FEOFF(inode));
/* we should not really be using osb in this context. */
- osb = OCFS_GENERIC_SB_P(inode->i_sb);
+ osb = OCFS_SB(inode->i_sb);
if (!inode->u.generic_ip) {
LOG_ERROR_ARGS("inode %lu has no generic_ip!\n", inode->i_ino);
@@ -840,7 +840,7 @@
goto bail;
}
- osb = OCFS_GENERIC_SB_P(inode->i_sb);
+ osb = OCFS_SB(inode->i_sb);
if ((iblock << 9) > PATH_MAX + 1) {
LOG_ERROR_ARGS ("file offset > PATH_MAX: %lu", iblock << 9);
@@ -908,7 +908,7 @@
goto bail;
}
- osb = OCFS_GENERIC_SB_P(inode->i_sb);
+ osb = OCFS_SB(inode->i_sb);
vbo = (__s64) iblock << inode->i_sb->s_blocksize_bits;
if (!INODE_JOURNAL(inode) && vbo >= OCFS_I(inode)->alloc_size) {
@@ -965,7 +965,7 @@
#endif
{
int disk_block = 0;
- ocfs_super *osb = OCFS_GENERIC_SB_P(mapping->host->i_sb);
+ ocfs_super *osb = OCFS_SB(mapping->host->i_sb);
__s64 vbo = 0;
__s64 lbo = 0;
__u32 len;
@@ -1025,7 +1025,7 @@
goto bail;
}
- osb = OCFS_GENERIC_SB_P(inode->i_sb);
+ osb = OCFS_SB(inode->i_sb);
vbo = (__s64) iblock << inode->i_sb->s_blocksize_bits;
len = 1;
Modified: trunk/src/namei.c
===================================================================
--- trunk/src/namei.c 2004-05-11 01:12:05 UTC (rev 911)
+++ trunk/src/namei.c 2004-05-12 18:55:28 UTC (rev 912)
@@ -71,7 +71,7 @@
struct inode *inode = NULL;
struct super_block *sb = dir->i_sb;
struct dentry *ret;
- ocfs_super *osb = OCFS_GENERIC_SB_P(sb);
+ ocfs_super *osb = OCFS_SB(sb);
LOG_ENTRY_ARGS ("(0x%p, 0x%p, '%*s')\n", dir, dentry,
dentry->d_name.len, dentry->d_name.name);
@@ -136,7 +136,7 @@
dev, dentry->d_name.len, dentry->d_name.name);
/* get our super block */
- osb = OCFS_GENERIC_SB_P(dir->i_sb);
+ osb = OCFS_SB(dir->i_sb);
if (osb->osb_flags & OCFS_OSB_FLAGS_SHUTDOWN) {
LOG_ERROR_STR ("Volume has been shutdown");
status = -EACCES;
@@ -491,7 +491,7 @@
dentry->d_name.len, dentry->d_name.name);
inode = dentry->d_inode;
- osb = OCFS_GENERIC_SB_P(dir->i_sb);
+ osb = OCFS_SB(dir->i_sb);
fileOff = GET_INODE_FEOFF(inode);
if (fileOff == -1)
@@ -826,7 +826,7 @@
old_dentry->d_name.len, old_dentry->d_name.name,
new_dentry->d_name.len, new_dentry->d_name.name);
- osb = OCFS_GENERIC_SB_P(old_dir->i_sb);
+ osb = OCFS_SB(old_dir->i_sb);
/* old parent dir offset */
oldDirOff = GET_INODE_FEOFF(old_dir);
@@ -1193,7 +1193,7 @@
dentry->d_name.name);
sb = dir->i_sb;
- osb = OCFS_GENERIC_SB_P(sb);
+ osb = OCFS_SB(sb);
inode = new_inode (sb);
if (IS_ERR (inode)) {
Modified: trunk/src/super.c
===================================================================
--- trunk/src/super.c 2004-05-11 01:12:05 UTC (rev 911)
+++ trunk/src/super.c 2004-05-12 18:55:28 UTC (rev 912)
@@ -277,7 +277,7 @@
if (status < 0)
goto read_super_error;
- osb = OCFS_GENERIC_SB_P(sb);
+ osb = OCFS_SB(sb);
if (!osb) {
status = -EINVAL;
goto read_super_error;
@@ -730,7 +730,7 @@
LOG_ENTRY_ARGS ("(%p, %p)\n", sb, buf);
- osb = OCFS_GENERIC_SB_P(sb);
+ osb = OCFS_SB(sb);
numbits = osb->cluster_bitmap.validbits;
status = ocfs_read_bh (osb, OCFS_BITMAP_LOCK_OFFSET, &bh, 0, NULL);
@@ -1063,7 +1063,7 @@
goto leave;
}
- osb = OCFS_GENERIC_SB_P(sb);
+ osb = OCFS_SB(sb);
if ( osb == NULL) {
LOG_ERROR_STATUS (status = -EFAIL);
Modified: trunk/src/symlink.c
===================================================================
--- trunk/src/symlink.c 2004-05-11 01:12:05 UTC (rev 911)
+++ trunk/src/symlink.c 2004-05-12 18:55:28 UTC (rev 912)
@@ -119,7 +119,7 @@
unsigned l;
char buf[10];
struct inode *inode = data;
- ocfs_super *osb = OCFS_GENERIC_SB_P(inode->i_sb);
+ ocfs_super *osb = OCFS_SB(inode->i_sb);
sprintf(buf,"%lu", (unsigned long)osb->node_num);
l = strlen(buf);
More information about the Ocfs2-commits
mailing list