patch-2.4.23 linux-2.4.23/fs/jfs/jfs_dtree.c
Next file: linux-2.4.23/fs/jfs/jfs_extent.c
Previous file: linux-2.4.23/fs/jfs/jfs_dmap.c
Back to the patch index
Back to the overall index
- Lines: 206
- Date:
2003-11-28 10:26:21.000000000 -0800
- Orig file:
linux-2.4.22/fs/jfs/jfs_dtree.c
- Orig date:
2003-08-25 04:44:43.000000000 -0700
diff -urN linux-2.4.22/fs/jfs/jfs_dtree.c linux-2.4.23/fs/jfs/jfs_dtree.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) International Business Machines Corp., 2000-2002
+ * Copyright (C) International Business Machines Corp., 2000-2003
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -130,11 +130,10 @@
if (((P)->header.nextindex > (((BN)==0)?DTROOTMAXSLOT:(P)->header.maxslot)) ||\
((BN) && ((P)->header.maxslot > DTPAGEMAXSLOT)))\
{\
- jfs_err("DT_GETPAGE: dtree page corrupt");\
BT_PUTPAGE(MP);\
- updateSuper((IP)->i_sb, FM_DIRTY);\
+ jfs_error((IP)->i_sb, "DT_GETPAGE: dtree page corrupt");\
MP = NULL;\
- RC = EIO;\
+ RC = -EIO;\
}\
}\
}
@@ -404,7 +403,7 @@
xtInsert(tid, ip, 0, 0, sbi->nbperpage,
&xaddr, 0))) {
jfs_warn("add_index: xtInsert failed!");
- return -1;
+ return -EPERM;
}
ip->i_size = PSIZE;
ip->i_blocks += LBLK2PBLK(sb, sbi->nbperpage);
@@ -412,7 +411,7 @@
if ((mp = get_index_page(ip, 0)) == 0) {
jfs_err("add_index: get_metapage failed!");
xtTruncate(tid, ip, 0, COMMIT_PWMAP);
- return -1;
+ return -EPERM;
}
tlck = txLock(tid, ip, mp, tlckDATA);
llck = (struct linelock *) & tlck->lock;
@@ -447,7 +446,7 @@
&xaddr, 0))) {
jfs_warn("add_index: xtInsert failed!");
jfs_ip->next_index--;
- return -1;
+ return -EPERM;
}
ip->i_size += PSIZE;
ip->i_blocks += LBLK2PBLK(sb, sbi->nbperpage);
@@ -461,7 +460,7 @@
if (mp == 0) {
jfs_err("add_index: get/read_metapage failed!");
- return -1;
+ return -EPERM;
}
lock_index(tid, ip, mp, index);
@@ -588,7 +587,7 @@
(wchar_t *) kmalloc((JFS_NAME_MAX + 1) * sizeof(wchar_t),
GFP_NOFS);
if (ciKey.name == 0) {
- rc = ENOMEM;
+ rc = -ENOMEM;
goto dtSearch_Exit2;
}
@@ -674,7 +673,7 @@
*/
if (flag == JFS_CREATE) {
*data = inumber;
- rc = EEXIST;
+ rc = -EEXIST;
goto out;
}
@@ -684,7 +683,7 @@
if ((flag == JFS_REMOVE ||
flag == JFS_RENAME) &&
*data != inumber) {
- rc = ESTALE;
+ rc = -ESTALE;
goto out;
}
@@ -732,7 +731,7 @@
*/
if (flag == JFS_LOOKUP || flag == JFS_REMOVE ||
flag == JFS_RENAME) {
- rc = ENOENT;
+ rc = -ENOENT;
goto out;
}
@@ -768,9 +767,8 @@
/* Something's corrupted, mark filesytem dirty so
* chkdsk will fix it.
*/
- jfs_err("stack overrun in dtSearch!");
- updateSuper(sb, FM_DIRTY);
- rc = EIO;
+ jfs_error(sb, "stack overrun in dtSearch!");
+ rc = -EIO;
goto out;
}
btstack->nsplit++;
@@ -840,7 +838,7 @@
if (DO_INDEX(ip)) {
if (JFS_IP(ip)->next_index == DIREND) {
DT_PUTPAGE(mp);
- return EMLINK;
+ return -EMLINK;
}
n = NDTLEAF(name->namlen);
data.leaf.tid = tid;
@@ -953,7 +951,7 @@
GFP_NOFS);
if (key.name == 0) {
DT_PUTPAGE(smp);
- rc = ENOMEM;
+ rc = -ENOMEM;
goto dtSplitUp_Exit;
}
@@ -1328,7 +1326,7 @@
rbn = addressPXD(pxd);
rmp = get_metapage(ip, rbn, PSIZE, 1);
if (rmp == NULL)
- return EIO;
+ return -EIO;
jfs_info("dtSplitPage: ip:0x%p smp:0x%p rmp:0x%p", ip, smp, rmp);
@@ -1579,7 +1577,7 @@
ip->i_blocks += LBLK2PBLK(sb, lengthPXD(pxd));
- return 0;
+ return rc;
}
@@ -2628,7 +2626,7 @@
* descend down to leftmost child page
*/
if (p->header.flag & BT_LEAF)
- return ESTALE;
+ return -ESTALE;
/* get the leftmost entry */
stbl = DT_GETSTBL(p);
@@ -2666,7 +2664,7 @@
bn = le64_to_cpu(p->header.next);
else {
DT_PUTPAGE(mp);
- return ESTALE;
+ return -ESTALE;
}
/* unpin current page */
@@ -3068,7 +3066,7 @@
}
if ((rc = dtReadFirst(ip, &btstack)))
- return -rc;
+ return rc;
DT_GETSEARCH(ip, btstack.top, bn, mp, p, index);
}
@@ -3204,11 +3202,12 @@
d_namleft -= len;
/* Sanity Check */
if (d_namleft == 0) {
- jfs_err("JFS:Dtree error: ino = "
- "%ld, bn=%Ld, index = %d",
- (long)ip->i_ino,(long long)bn,
- i);
- updateSuper(ip->i_sb, FM_DIRTY);
+ jfs_error(ip->i_sb,
+ "JFS:Dtree error: ino = "
+ "%ld, bn=%Ld, index = %d",
+ (long)ip->i_ino,
+ (long long)bn,
+ i);
goto skip_one;
}
len = min(d_namleft, DTSLOTDATALEN);
@@ -3268,7 +3267,7 @@
DT_GETPAGE(ip, bn, mp, PSIZE, p, rc);
if (rc) {
free_page(dirent_buf);
- return -rc;
+ return rc;
}
}
@@ -4434,8 +4433,8 @@
* flag - JFS_RENAME
*
* RETURNS:
- * ESTALE - If entry found does not match orig_ino passed in
- * ENOENT - If no entry can be found to match key
+ * -ESTALE - If entry found does not match orig_ino passed in
+ * -ENOENT - If no entry can be found to match key
* 0 - If successfully modified entry
*/
int dtModify(tid_t tid, struct inode *ip,
FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)