Skip to content

L
linux
Commit 8319ca6a authored by Alexander Viro's avatar Alexander Viro Committed by Linus Torvalds
Browse files
Options

[PATCH] sparse: NULL noise in jfs

parent be6cdf41
Hide whitespace changes
Inline Side-by-side
Showing with 56 additions and 56 deletions
fs/jfs/jfs_dtree.c
View file @ 8319ca6a
......@@ -259,19 +259,19 @@ static struct dir_table_slot *find_index(struct inode *ip, u32 index,
jfs_warn("find_entry called with index = %d", index);
maxWarnings--;
}
return 0;
return NULL;
}
if (index >= jfs_ip->next_index) {
jfs_warn("find_entry called with index >= next_index");
return 0;
return NULL;
}
if (jfs_ip->next_index <= (MAX_INLINE_DIRTABLE_ENTRY + 1)) {
/*
* Inline directory table
*/
*mp = 0;
*mp = NULL;
slot = &jfs_ip->i_dirtable[index - 2];
} else {
offset = (index - 2) * sizeof(struct dir_table_slot);
......@@ -281,7 +281,7 @@ static struct dir_table_slot *find_index(struct inode *ip, u32 index,
if (*mp && (*lblock != blkno)) {
release_metapage(*mp);
*mp = 0;
*mp = NULL;
}
if (*mp == 0) {
*lblock = blkno;
......@@ -289,7 +289,7 @@ static struct dir_table_slot *find_index(struct inode *ip, u32 index,
}
if (*mp == 0) {
jfs_err("free_index: error reading directory table");
return 0;
return NULL;
}
slot =
......@@ -490,7 +490,7 @@ static void free_index(tid_t tid, struct inode *ip, u32 index, u32 next)
{
struct dir_table_slot *dirtab_slot;
s64 lblock;
struct metapage *mp = 0;
struct metapage *mp = NULL;
dirtab_slot = find_index(ip, index, &mp, &lblock);
......@@ -543,7 +543,7 @@ static int read_index(struct inode *ip, u32 index,
struct dir_table_slot * dirtab_slot)
{
s64 lblock;
struct metapage *mp = 0;
struct metapage *mp = NULL;
struct dir_table_slot *slot;
slot = find_index(ip, index, &mp, &lblock);
......@@ -850,7 +850,7 @@ int dtInsert(tid_t tid, struct inode *ip,
data.leaf.ip = ip;
} else {
n = NDTLEAF_LEGACY(name->namlen);
data.leaf.ip = 0; /* signifies legacy directory format */
data.leaf.ip = NULL; /* signifies legacy directory format */
}
data.leaf.ino = cpu_to_le32(*fsn);
......@@ -940,7 +940,7 @@ static int dtSplitUp(tid_t tid,
int xlen, xsize;
struct pxdlist pxdlist;
pxd_t *pxd;
struct component_name key = { 0, 0 };
struct component_name key = { 0, NULL };
ddata_t *data = split->data;
int n;
struct dt_lock *dtlck;
......@@ -1550,7 +1550,7 @@ static int dtSplitPage(tid_t tid, struct inode *ip, struct dtsplit * split,
if ((rp->header.flag & BT_LEAF) && DO_INDEX(ip)) {
s64 lblock;
mp = 0;
mp = NULL;
stbl = DT_GETSTBL(rp);
for (n = 0; n < rp->header.nextindex; n++) {
ldtentry = (struct ldtentry *) & rp->slot[stbl[n]];
......@@ -1676,7 +1676,7 @@ static int dtExtendPage(tid_t tid,
if (DO_INDEX(ip)) {
s64 lblock;
mp = 0;
mp = NULL;
stbl = DT_GETSTBL(sp);
for (n = 0; n < sp->header.nextindex; n++) {
ldtentry =
......@@ -1970,7 +1970,7 @@ static int dtSplitRoot(tid_t tid,
*/
if ((rp->header.flag & BT_LEAF) && DO_INDEX(ip)) {
s64 lblock;
struct metapage *mp = 0;
struct metapage *mp = NULL;
struct ldtentry *ldtentry;
stbl = DT_GETSTBL(rp);
......@@ -2181,7 +2181,7 @@ int dtDelete(tid_t tid,
if (DO_INDEX(ip) && index < p->header.nextindex) {
s64 lblock;
imp = 0;
imp = NULL;
stbl = DT_GETSTBL(p);
for (i = index; i < p->header.nextindex; i++) {
ldtentry =
......@@ -3873,8 +3873,8 @@ static void dtInsertEntry(dtpage_t * p, int index, struct component_name * key,
ddata_t * data, struct dt_lock ** dtlock)
{
struct dtslot *h, *t;
struct ldtentry *lh = 0;
struct idtentry *ih = 0;
struct ldtentry *lh = NULL;
struct idtentry *ih = NULL;
int hsi, fsi, klen, len, nextindex;
wchar_t *kname, *name;
s8 *stbl;
......@@ -3883,7 +3883,7 @@ static void dtInsertEntry(dtpage_t * p, int index, struct component_name * key,
struct lv *lv;
int xsi, n;
s64 bn = 0;
struct metapage *mp = 0;
struct metapage *mp = NULL;
klen = key->namlen;
kname = key->name;
......@@ -3999,7 +3999,7 @@ static void dtInsertEntry(dtpage_t * p, int index, struct component_name * key,
* Need to update slot number for entries that moved
* in the stbl
*/
mp = 0;
mp = NULL;
for (n = index + 1; n <= nextindex; n++) {
lh = (struct ldtentry *) & (p->slot[stbl[n]]);
modify_index(data->leaf.tid, data->leaf.ip,
......@@ -4035,8 +4035,8 @@ static void dtMoveEntry(dtpage_t * sp, int si, dtpage_t * dp,
int dsi; /* dst slot index */
s8 *sstbl, *dstbl; /* sorted entry table */
int snamlen, len;
struct ldtentry *slh, *dlh = 0;
struct idtentry *sih, *dih = 0;
struct ldtentry *slh, *dlh = NULL;
struct idtentry *sih, *dih = NULL;
struct dtslot *h, *s, *d;
struct dt_lock *sdtlck = *sdtlock, *ddtlck = *ddtlock;
struct lv *slv, *dlv;
......
fs/jfs/jfs_imap.c
View file @ 8319ca6a
......@@ -2061,7 +2061,7 @@ static int diAllocBit(struct inomap * imap, struct iag * iagp, int ino)
{
int extno, bitno, agno, sword, rc;
struct metapage *amp = NULL, *bmp = NULL;
struct iag *aiagp = 0, *biagp = 0;
struct iag *aiagp = NULL, *biagp = NULL;
u32 mask;
/* check if this is the last free inode within the iag.
......@@ -2207,7 +2207,7 @@ static int diAllocBit(struct inomap * imap, struct iag * iagp, int ino)
static int diNewExt(struct inomap * imap, struct iag * iagp, int extno)
{
int agno, iagno, fwd, back, freei = 0, sword, rc;
struct iag *aiagp = 0, *biagp = 0, *ciagp = 0;
struct iag *aiagp = NULL, *biagp = NULL, *ciagp = NULL;
struct metapage *amp, *bmp, *cmp, *dmp;
struct inode *ipimap;
s64 blkno, hint;
......@@ -2910,7 +2910,7 @@ int diExtendFS(struct inode *ipimap, struct inode *ipbmap)
{
int rc, rcx = 0;
struct inomap *imap = JFS_IP(ipimap)->i_imap;
struct iag *iagp = 0, *hiagp = 0;
struct iag *iagp = NULL, *hiagp = NULL;
struct bmap *mp = JFS_SBI(ipbmap->i_sb)->bmap;
struct metapage *bp, *hbp;
int i, n, head;
......
fs/jfs/jfs_metapage.c
View file @ 8319ca6a
......@@ -320,7 +320,7 @@ struct metapage *__get_metapage(struct inode *inode, unsigned long lblock,
atomic_set(&mp->nohomeok,0);
mp->mapping = mapping;
mp->index = lblock;
mp->page = 0;
mp->page = NULL;
mp->logical_size = size;
add_to_hash(mp, hash_ptr);
spin_unlock(&meta_lock);
......@@ -465,7 +465,7 @@ void release_metapage(struct metapage * mp)
set_bit(META_stale, &mp->flag);
spin_unlock(&meta_lock);
kunmap(mp->page);
mp->data = 0;
mp->data = NULL;
if (test_bit(META_dirty, &mp->flag))
__write_metapage(mp);
if (test_bit(META_sync, &mp->flag)) {
......@@ -491,7 +491,7 @@ void release_metapage(struct metapage * mp)
*/
log = mp->log;
LOGSYNC_LOCK(log);
mp->log = 0;
mp->log = NULL;
mp->lsn = 0;
mp->clsn = 0;
log->count--;
......
fs/jfs/jfs_mount.c
View file @ 8319ca6a
......@@ -166,7 +166,7 @@ int jfs_mount(struct super_block *sb)
}
} else
/* Secondary aggregate inode table is not valid */
sbi->ipaimap2 = 0;
sbi->ipaimap2 = NULL;
/*
* mount (the only/single) fileset
......
fs/jfs/jfs_txnmgr.c
View file @ 8319ca6a
......@@ -330,9 +330,9 @@ int txInit(void)
void txExit(void)
{
vfree(TxLock);
TxLock = 0;
TxLock = NULL;
vfree(TxBlock);
TxBlock = 0;
TxBlock = NULL;
}
......@@ -1554,7 +1554,7 @@ static int dataLog(struct jfs_log * log, struct tblock * tblk, struct lrd * lrd,
hold_metapage(mp, 0);
atomic_dec(&mp->nohomeok);
discard_metapage(mp);
tlck->mp = 0;
tlck->mp = NULL;
return 0;
}
......@@ -2270,7 +2270,7 @@ static void txUpdateMap(struct tblock * tblk)
struct pxd_lock pxdlock;
int maptype;
int k, nlock;
struct metapage *mp = 0;
struct metapage *mp = NULL;
ipimap = JFS_SBI(tblk->sb)->ipimap;
......@@ -2358,7 +2358,7 @@ static void txUpdateMap(struct tblock * tblk)
assert(atomic_read(&mp->nohomeok) == 1);
atomic_dec(&mp->nohomeok);
discard_metapage(mp);
tlck->mp = 0;
tlck->mp = NULL;
}
}
/*
......
fs/jfs/jfs_uniupr.c
View file @ 8319ca6a
......@@ -130,5 +130,5 @@ UNICASERANGE UniUpperRange[] = {
{ 0x0490, 0x04cc, UniCaseRangeU0490 },
{ 0x1e00, 0x1ffc, UniCaseRangeU1e00 },
{ 0xff40, 0xff5a, UniCaseRangeUff40 },
{ 0, 0, 0 }
{ 0 }
};
fs/jfs/jfs_xtree.c
View file @ 8319ca6a
......@@ -1222,7 +1222,7 @@ xtSplitPage(tid_t tid, struct inode *ip,
struct pxdlist *pxdlist;
pxd_t *pxd;
struct tlock *tlck;
struct xtlock *sxtlck = 0, *rxtlck = 0;
struct xtlock *sxtlck = NULL, *rxtlck = NULL;
smp = split->mp;
sp = XT_PAGE(ip, smp);
......@@ -1603,7 +1603,7 @@ int xtExtend(tid_t tid, /* transaction id */
xad_t *xad;
s64 xaddr;
struct tlock *tlck;
struct xtlock *xtlck = 0;
struct xtlock *xtlck = NULL;
int rootsplit = 0;
jfs_info("xtExtend: nxoff:0x%lx nxlen:0x%x", (ulong) xoff, xlen);
......@@ -1957,7 +1957,7 @@ int xtUpdate(tid_t tid, struct inode *ip, xad_t * nxad)
int nxlen, xlen, lxlen, rxlen;
s64 nxaddr, xaddr;
struct tlock *tlck;
struct xtlock *xtlck = 0;
struct xtlock *xtlck = NULL;
int rootsplit = 0, newpage = 0;
/* there must exist extent to be tailgated */
......@@ -3416,9 +3416,9 @@ s64 xtTruncate(tid_t tid, struct inode *ip, s64 newsize, int flag)
int xlen, len, freexlen;
struct btstack btstack;
struct btframe *parent;
struct tblock *tblk = 0;
struct tlock *tlck = 0;
struct xtlock *xtlck = 0;
struct tblock *tblk = NULL;
struct tlock *tlck = NULL;
struct xtlock *xtlck = NULL;
struct xdlistlock xadlock; /* maplock for COMMIT_WMAP */
struct pxd_lock *pxdlock; /* maplock for COMMIT_WMAP */
s64 nfreed;
......@@ -3614,7 +3614,7 @@ s64 xtTruncate(tid_t tid, struct inode *ip, s64 newsize, int flag)
pxdlock->flag = mlckFREEPXD;
PXDaddress(&pxdlock->pxd, xaddr);
PXDlength(&pxdlock->pxd, freexlen);
txFreeMap(ip, pxdlock, 0, COMMIT_WMAP);
txFreeMap(ip, pxdlock, NULL, COMMIT_WMAP);
/* reset map lock */
xadlock.flag = mlckFREEXADLIST;
......@@ -3642,8 +3642,8 @@ s64 xtTruncate(tid_t tid, struct inode *ip, s64 newsize, int flag)
xadlock.count =
le16_to_cpu(p->header.nextindex) -
nextindex;
txFreeMap(ip, (struct maplock *) & xadlock, 0,
COMMIT_WMAP);
txFreeMap(ip, (struct maplock *) & xadlock,
NULL, COMMIT_WMAP);
}
p->header.nextindex = cpu_to_le16(nextindex);
}
......@@ -3672,7 +3672,7 @@ s64 xtTruncate(tid_t tid, struct inode *ip, s64 newsize, int flag)
xadlock.xdlist = &p->xad[XTENTRYSTART];
xadlock.count =
le16_to_cpu(p->header.nextindex) - XTENTRYSTART;
txFreeMap(ip, (struct maplock *) & xadlock, 0, COMMIT_WMAP);
txFreeMap(ip, (struct maplock *) & xadlock, NULL, COMMIT_WMAP);
}
if (p->header.flag & BT_ROOT) {
......@@ -3747,8 +3747,8 @@ s64 xtTruncate(tid_t tid, struct inode *ip, s64 newsize, int flag)
xadlock.count =
le16_to_cpu(p->header.nextindex) -
index - 1;
txFreeMap(ip, (struct maplock *) & xadlock, 0,
COMMIT_WMAP);
txFreeMap(ip, (struct maplock *) & xadlock,
NULL, COMMIT_WMAP);
}
BT_MARK_DIRTY(mp, ip);
......@@ -3819,7 +3819,7 @@ s64 xtTruncate(tid_t tid, struct inode *ip, s64 newsize, int flag)
xadlock.count =
le16_to_cpu(p->header.nextindex) -
XTENTRYSTART;
txFreeMap(ip, (struct maplock *) & xadlock, 0,
txFreeMap(ip, (struct maplock *) & xadlock, NULL,
COMMIT_WMAP);
}
BT_MARK_DIRTY(mp, ip);
......@@ -3956,11 +3956,11 @@ s64 xtTruncate_pmap(tid_t tid, struct inode *ip, s64 committed_size)
struct btframe *parent;
int rc;
struct tblock *tblk;
struct tlock *tlck = 0;
struct tlock *tlck = NULL;
xad_t *xad;
int xlen;
s64 xoff;
struct xtlock *xtlck = 0;
struct xtlock *xtlck = NULL;
/* save object truncation type */
tblk = tid_to_tblock(tid);
......
fs/jfs/namei.c
View file @ 8319ca6a
......@@ -702,7 +702,7 @@ int freeZeroLink(struct inode *ip)
pxdlock->flag = mlckFREEPXD;
PXDaddress(&pxdlock->pxd, xaddr);
PXDlength(&pxdlock->pxd, xlen);
txFreeMap(ip, pxdlock, 0, COMMIT_WMAP);
txFreeMap(ip, pxdlock, NULL, COMMIT_WMAP);
}
/*
......@@ -722,7 +722,7 @@ int freeZeroLink(struct inode *ip)
pxdlock->flag = mlckFREEPXD;
PXDaddress(&pxdlock->pxd, xaddr);
PXDlength(&pxdlock->pxd, xlen);
txFreeMap(ip, pxdlock, 0, COMMIT_WMAP);
txFreeMap(ip, pxdlock, NULL, COMMIT_WMAP);
}
/*
......
fs/jfs/super.c
View file @ 8319ca6a
......@@ -422,7 +422,7 @@ static int jfs_fill_super(struct super_block *sb, void *data, int silent)
goto out_kfree;
}
if (sb->s_flags & MS_RDONLY)
sbi->log = 0;
sbi->log = NULL;
else {
rc = jfs_mount_rw(sb, 0);
if (rc) {
......@@ -600,7 +600,7 @@ static int __init init_jfs_fs(void)
/*
* I/O completion thread (endio)
*/
jfsIOthread = kernel_thread(jfsIOWait, 0, CLONE_KERNEL);
jfsIOthread = kernel_thread(jfsIOWait, NULL, CLONE_KERNEL);
if (jfsIOthread < 0) {
jfs_err("init_jfs_fs: fork failed w/rc = %d", jfsIOthread);
goto end_txmngr;
......@@ -613,7 +613,7 @@ static int __init init_jfs_fs(void)
commit_threads = MAX_COMMIT_THREADS;
for (i = 0; i < commit_threads; i++) {
jfsCommitThread[i] = kernel_thread(jfs_lazycommit, 0,
jfsCommitThread[i] = kernel_thread(jfs_lazycommit, NULL,
CLONE_KERNEL);
if (jfsCommitThread[i] < 0) {
jfs_err("init_jfs_fs: fork failed w/rc = %d",
......@@ -625,7 +625,7 @@ static int __init init_jfs_fs(void)
wait_for_completion(&jfsIOwait);
}
jfsSyncThread = kernel_thread(jfs_sync, 0, CLONE_KERNEL);
jfsSyncThread = kernel_thread(jfs_sync, NULL, CLONE_KERNEL);
if (jfsSyncThread < 0) {
jfs_err("init_jfs_fs: fork failed w/rc = %d", jfsSyncThread);
goto kill_committask;
......
fs/jfs/xattr.c
View file @ 8319ca6a
......@@ -592,7 +592,7 @@ static int ea_put(struct inode *inode, struct ea_buffer *ea_buf, int new_size)
if (new_size == 0) {
ea_release(inode, ea_buf);
ea_buf = 0;
ea_buf = NULL;
} else if (ea_buf->flag & EA_INLINE) {
assert(new_size <= sizeof (ji->i_inline_ea));
ji->mode2 &= ~INLINEEA;
......@@ -633,7 +633,7 @@ static int ea_put(struct inode *inode, struct ea_buffer *ea_buf, int new_size)
}
ji->ea = ea_buf->new_ea;
} else {
txEA(tid, inode, &ji->ea, 0);
txEA(tid, inode, &ji->ea, NULL);
if (ji->ea.flag & DXD_INLINE)
ji->mode2 |= INLINEEA;
ji->ea.flag = 0;
......@@ -1039,5 +1039,5 @@ ssize_t jfs_listxattr(struct dentry * dentry, char *data, size_t buf_size)
int jfs_removexattr(struct dentry *dentry, const char *name)
{
return __jfs_setxattr(dentry->d_inode, name, 0, 0, XATTR_REPLACE);
return __jfs_setxattr(dentry->d_inode, name, NULL, 0, XATTR_REPLACE);
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7