JFS: Add lots of missing statics and remove dead code

Submitted by Christoph Hellwig

diff --git a/fs/jfs/acl.c b/fs/jfs/acl.c
index 62e56c0982daa16bbfa7a5f018b135c0c4048b40..958cdfb04a7df945181972b2a60c28caadca34ed 100644 (file)
--- a/fs/jfs/acl.c
+++ b/fs/jfs/acl.c
@@ -24,7 +24,7 @@
 #include "jfs_xattr.h"
 #include "jfs_acl.h"
 
-struct posix_acl *jfs_get_acl(struct inode *inode, int type)
+static struct posix_acl *jfs_get_acl(struct inode *inode, int type)
 {
        struct posix_acl *acl;
        char *ea_name;
@@ -74,7 +74,7 @@ struct posix_acl *jfs_get_acl(struct inode *inode, int type)
        return acl;
 }
 
-int jfs_set_acl(struct inode *inode, int type, struct posix_acl *acl)
+static int jfs_set_acl(struct inode *inode, int type, struct posix_acl *acl)
 {
        char *ea_name;
        struct jfs_inode_info *ji = JFS_IP(inode);
@@ -247,7 +247,7 @@ cleanup:
        return rc;
 }
 
-int jfs_acl_chmod(struct inode *inode)
+static int jfs_acl_chmod(struct inode *inode)
 {
        struct posix_acl *acl, *clone;
        int rc;

diff --git a/fs/jfs/jfs_acl.h b/fs/jfs/jfs_acl.h
index 2031b5bfa4ad70c26d152e07fa2a5ac009100e67..d2ae430adecf4a4b7712a1211f78a70a5961c145 100644 (file)
--- a/fs/jfs/jfs_acl.h
+++ b/fs/jfs/jfs_acl.h
@@ -22,8 +22,6 @@
 
 #include <linux/xattr_acl.h>
 
-struct posix_acl *jfs_get_acl(struct inode *, int);
-int jfs_set_acl(struct inode *, int, struct posix_acl *);
 int jfs_permission(struct inode *, int, struct nameidata *);
 int jfs_init_acl(struct inode *, struct inode *);
 int jfs_setattr(struct dentry *, struct iattr *);

diff --git a/fs/jfs/jfs_dmap.c b/fs/jfs/jfs_dmap.c
index dd036ace1f21543524881d020b3ab975d39c76f4..4de0cb0cc53bcaac4bc7b188658e646b38f5f5d2 100644 (file)
--- a/fs/jfs/jfs_dmap.c
+++ b/fs/jfs/jfs_dmap.c
@@ -124,7 +124,7 @@ static int dbAllocAG(struct bmap * bmp, int agno, s64 nblocks, int l2nb,
                     s64 * results);
 static int dbAllocCtl(struct bmap * bmp, s64 nblocks, int l2nb, s64 blkno,
                      s64 * results);
-int dbExtend(struct inode *ip, s64 blkno, s64 nblocks, s64 addnblocks);
+static int dbExtend(struct inode *ip, s64 blkno, s64 nblocks, s64 addnblocks);
 static int dbFindBits(u32 word, int l2nb);
 static int dbFindCtl(struct bmap * bmp, int l2nb, int level, s64 * blkno);
 static int dbFindLeaf(dmtree_t * tp, int l2nb, int *leafidx);
@@ -134,10 +134,10 @@ static int dbFreeDmap(struct bmap * bmp, struct dmap * dp, s64 blkno,
                      int nblocks);
 static int dbMaxBud(u8 * cp);
 s64 dbMapFileSizeToMapSize(struct inode *ipbmap);
-int blkstol2(s64 nb);
+static int blkstol2(s64 nb);
 
-int cntlz(u32 value);
-int cnttz(u32 word);
+static int cntlz(u32 value);
+static int cnttz(u32 word);
 
 static int dbAllocDmapBU(struct bmap * bmp, struct dmap * dp, s64 blkno,
                         int nblocks);
@@ -155,7 +155,7 @@ static int dbGetL2AGSize(s64 nblocks);
  * into the table, with the table elements yielding the maximum
  * binary buddy of free bits within the character.
  */
-signed char budtab[256] = {
+static s8 budtab[256] = {
        3, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
        2, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
        2, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
@@ -942,7 +942,7 @@ int dbAlloc(struct inode *ip, s64 hint, s64 nblocks, s64 * results)
        return (rc);
 }
 
-
+#ifdef _NOTYET
 /*
  * NAME:       dbAllocExact()
  *
@@ -1009,7 +1009,7 @@ int dbAllocExact(struct inode *ip, s64 blkno, int nblocks)
 
        return (rc);
 }
-
+#endif /* _NOTYET */
 
 /*
  * NAME:       dbReAlloc()
@@ -1092,7 +1092,7 @@ dbReAlloc(struct inode *ip,
  *      -ENOSPC        - insufficient disk resources
  *      -EIO   - i/o error
  */
-int dbExtend(struct inode *ip, s64 blkno, s64 nblocks, s64 addnblocks)
+static int dbExtend(struct inode *ip, s64 blkno, s64 nblocks, s64 addnblocks)
 {
        struct jfs_sb_info *sbi = JFS_SBI(ip->i_sb);
        s64 lblkno, lastblkno, extblkno;
@@ -3022,7 +3022,7 @@ static int dbMaxBud(u8 * cp)
  * RETURN VALUES:
  *      count of trailing zeros
  */
-int cnttz(u32 word)
+static int cnttz(u32 word)
 {
        int n;
 
@@ -3047,7 +3047,7 @@ int cnttz(u32 word)
  * RETURN VALUES:
  *      count of leading zeros
  */
-int cntlz(u32 value)
+static int cntlz(u32 value)
 {
        int n;
 

diff --git a/fs/jfs/jfs_dmap.h b/fs/jfs/jfs_dmap.h
index ba7ae198637376c5551dfe8e73ba07f042cfdeff..9599b9ff109d0cebffb010e1519adb44ca2d982b 100644 (file)
--- a/fs/jfs/jfs_dmap.h
+++ b/fs/jfs/jfs_dmap.h
@@ -286,8 +286,6 @@ extern int dbNextAG(struct inode *ipbmap);
 
 extern int dbAlloc(struct inode *ipbmap, s64 hint, s64 nblocks, s64 * results);
 
-extern int dbAllocExact(struct inode *ip, s64 blkno, int nblocks);
-
 extern int dbReAlloc(struct inode *ipbmap,
                     s64 blkno, s64 nblocks, s64 addnblocks, s64 * results);
 

diff --git a/fs/jfs/jfs_dtree.c b/fs/jfs/jfs_dtree.c
index 4c4a6b5ccda2190bb6cbdbf49a54f80378fbf3b7..5538a32ac3f59a5e5f2a19167049a01b16c1705c 100644 (file)
--- a/fs/jfs/jfs_dtree.c
+++ b/fs/jfs/jfs_dtree.c
@@ -162,9 +162,6 @@ static int dtSplitRoot(tid_t tid, struct inode *ip,
 static int dtDeleteUp(tid_t tid, struct inode *ip, struct metapage * fmp,
                      dtpage_t * fp, struct btstack * btstack);
 
-static int dtSearchNode(struct inode *ip,
-                       s64 lmxaddr, pxd_t * kpxd, struct btstack * btstack);
-
 static int dtRelink(tid_t tid, struct inode *ip, dtpage_t * p);
 
 static int dtReadFirst(struct inode *ip, struct btstack * btstack);
@@ -2380,7 +2377,7 @@ static int dtDeleteUp(tid_t tid, struct inode *ip,
        return 0;
 }
 
-
+#ifdef _NOTYET
 /*
  * NAME:        dtRelocate()
  *
@@ -2575,7 +2572,6 @@ int dtRelocate(tid_t tid, struct inode *ip, s64 lmxaddr, pxd_t * opxd,
        return rc;
 }
 
-
 /*
  * NAME:       dtSearchNode()
  *
@@ -2677,7 +2673,7 @@ static int dtSearchNode(struct inode *ip, s64 lmxaddr, pxd_t * kpxd,
 
        goto loop;
 }
-
+#endif /* _NOTYET */
 
 /*
  *     dtRelink()
@@ -2933,7 +2929,7 @@ struct jfs_dirent {
 /*
  * function to determine next variable-sized jfs_dirent in buffer
  */
-inline struct jfs_dirent *next_jfs_dirent(struct jfs_dirent *dirent)
+static inline struct jfs_dirent *next_jfs_dirent(struct jfs_dirent *dirent)
 {
        return (struct jfs_dirent *)
                ((char *)dirent +

diff --git a/fs/jfs/jfs_dtree.h b/fs/jfs/jfs_dtree.h
index a78b1aa3f559e0654e20b9aa190c0713c5112573..d7bc0cfae1f62160797d8a3d250de3dcdadcc74c 100644 (file)
--- a/fs/jfs/jfs_dtree.h
+++ b/fs/jfs/jfs_dtree.h
@@ -265,9 +265,6 @@ extern int dtInsert(tid_t tid, struct inode *ip, struct component_name * key,
 extern int dtDelete(tid_t tid, struct inode *ip, struct component_name * key,
                    ino_t * data, int flag);
 
-extern int dtRelocate(tid_t tid,
-                     struct inode *ip, s64 lmxaddr, pxd_t * opxd, s64 nxaddr);
-
 extern int dtModify(tid_t tid, struct inode *ip, struct component_name * key,
                    ino_t * orig_ino, ino_t new_ino, int flag);
 

diff --git a/fs/jfs/jfs_extent.c b/fs/jfs/jfs_extent.c
index 4371b6489a5ca5a7bddecb04b0fc8a5ca3b3186c..399572237f35b06668f65f8be64b5b5cd7e73e0a 100644 (file)
--- a/fs/jfs/jfs_extent.c
+++ b/fs/jfs/jfs_extent.c
@@ -35,7 +35,6 @@ static s64 extRoundDown(s64 nb);
 /*
  * external references
  */
-extern int dbExtend(struct inode *, s64, s64, s64);
 extern int jfs_commit_inode(struct inode *, int);
 
 

diff --git a/fs/jfs/jfs_logmgr.c b/fs/jfs/jfs_logmgr.c
index 55fa84de7c95d855ed450c04ea3c3832bd9ea612..b3261576144ceb8d09b6a1894ccd2803f230b83c 100644 (file)
--- a/fs/jfs/jfs_logmgr.c
+++ b/fs/jfs/jfs_logmgr.c
@@ -196,6 +196,7 @@ static int lbmIOWait(struct lbuf * bp, int flag);
 static bio_end_io_t lbmIODone;
 static void lbmStartIO(struct lbuf * bp);
 static void lmGCwrite(struct jfs_log * log, int cant_block);
+static int lmLogSync(struct jfs_log * log, int nosyncwait);
 
 
 
@@ -810,7 +811,7 @@ static void lmGCwrite(struct jfs_log * log, int cant_write)
  * NOTE:
  *     This routine is called a interrupt time by lbmIODone
  */
-void lmPostGC(struct lbuf * bp)
+static void lmPostGC(struct lbuf * bp)
 {
        unsigned long flags;
        struct jfs_log *log = bp->l_log;
@@ -933,7 +934,7 @@ void lmPostGC(struct lbuf * bp)
  *                     
  * serialization: LOG_LOCK() held on entry/exit
  */
-int lmLogSync(struct jfs_log * log, int nosyncwait)
+static int lmLogSync(struct jfs_log * log, int nosyncwait)
 {
        int logsize;
        int written;            /* written since last syncpt */

diff --git a/fs/jfs/jfs_logmgr.h b/fs/jfs/jfs_logmgr.h
index 5847d62c6dbe5c52081a014d2494fe470751242e..da4762c3c22fb7c51ecaf2555d75cde79561a4ad 100644 (file)
--- a/fs/jfs/jfs_logmgr.h
+++ b/fs/jfs/jfs_logmgr.h
@@ -505,7 +505,6 @@ struct logsyncblk {
 
 extern int lmLogOpen(struct super_block *sb);
 extern int lmLogClose(struct super_block *sb);
-extern int lmLogSync(struct jfs_log * log, int nosyncwait);
 extern int lmLogShutdown(struct jfs_log * log);
 extern int lmLogInit(struct jfs_log * log);
 extern int lmLogFormat(struct jfs_log *log, s64 logAddress, int logSize);

diff --git a/fs/jfs/jfs_txnmgr.c b/fs/jfs/jfs_txnmgr.c
index 4b0c8eb3a5f422ccc56f182b30b6244e5b68494c..47ca2b1eaf5708d6548f7b3f548243c1008ad9c3 100644 (file)
--- a/fs/jfs/jfs_txnmgr.c
+++ b/fs/jfs/jfs_txnmgr.c
@@ -168,25 +168,23 @@ extern struct completion jfsIOwait;
 /*
  * forward references
  */
-int diLog(struct jfs_log * log, struct tblock * tblk, struct lrd * lrd,
-         struct tlock * tlck, struct commit * cd);
-int dataLog(struct jfs_log * log, struct tblock * tblk, struct lrd * lrd,
-           struct tlock * tlck);
-void dtLog(struct jfs_log * log, struct tblock * tblk, struct lrd * lrd,
-          struct tlock * tlck);
-void inlineLog(struct jfs_log * log, struct tblock * tblk, struct lrd * lrd,
-              struct tlock * tlck);
-void mapLog(struct jfs_log * log, struct tblock * tblk, struct lrd * lrd,
-           struct tlock * tlck);
+static int diLog(struct jfs_log * log, struct tblock * tblk, struct lrd * lrd,
+               struct tlock * tlck, struct commit * cd);
+static int dataLog(struct jfs_log * log, struct tblock * tblk, struct lrd * lrd,
+               struct tlock * tlck);
+static void dtLog(struct jfs_log * log, struct tblock * tblk, struct lrd * lrd,
+               struct tlock * tlck);
+static void mapLog(struct jfs_log * log, struct tblock * tblk, struct lrd * lrd,
+               struct tlock * tlck);
 static void txAbortCommit(struct commit * cd);
 static void txAllocPMap(struct inode *ip, struct maplock * maplock,
-                       struct tblock * tblk);
-void txForce(struct tblock * tblk);
-static int txLog(struct jfs_log * log, struct tblock * tblk, struct commit * cd);
-int txMoreLock(void);
+               struct tblock * tblk);
+static void txForce(struct tblock * tblk);
+static int txLog(struct jfs_log * log, struct tblock * tblk,
+               struct commit * cd);
 static void txUpdateMap(struct tblock * tblk);
 static void txRelease(struct tblock * tblk);
-void xtLog(struct jfs_log * log, struct tblock * tblk, struct lrd * lrd,
+static void xtLog(struct jfs_log * log, struct tblock * tblk, struct lrd * lrd,
           struct tlock * tlck);
 static void LogSyncRelease(struct metapage * mp);
 
@@ -1399,7 +1397,7 @@ static int txLog(struct jfs_log * log, struct tblock * tblk, struct commit * cd)
  *
  * function:    log inode tlock and format maplock to update bmap;
  */
-int diLog(struct jfs_log * log, struct tblock * tblk, struct lrd * lrd,
+static int diLog(struct jfs_log * log, struct tblock * tblk, struct lrd * lrd,
          struct tlock * tlck, struct commit * cd)
 {
        int rc = 0;
@@ -1514,7 +1512,7 @@ int diLog(struct jfs_log * log, struct tblock * tblk, struct lrd * lrd,
  *
  * function:    log data tlock
  */
-int dataLog(struct jfs_log * log, struct tblock * tblk, struct lrd * lrd,
+static int dataLog(struct jfs_log * log, struct tblock * tblk, struct lrd * lrd,
            struct tlock * tlck)
 {
        struct metapage *mp;
@@ -1560,7 +1558,7 @@ int dataLog(struct jfs_log * log, struct tblock * tblk, struct lrd * lrd,
  *
  * function:    log dtree tlock and format maplock to update bmap;
  */
-void dtLog(struct jfs_log * log, struct tblock * tblk, struct lrd * lrd,
+static void dtLog(struct jfs_log * log, struct tblock * tblk, struct lrd * lrd,
           struct tlock * tlck)
 {
        struct metapage *mp;
@@ -1665,7 +1663,7 @@ void dtLog(struct jfs_log * log, struct tblock * tblk, struct lrd * lrd,
  *
  * function:    log xtree tlock and format maplock to update bmap;
  */
-void xtLog(struct jfs_log * log, struct tblock * tblk, struct lrd * lrd,
+static void xtLog(struct jfs_log * log, struct tblock * tblk, struct lrd * lrd,
           struct tlock * tlck)
 {
        struct inode *ip;
@@ -2719,7 +2717,7 @@ static void txAbortCommit(struct commit * cd)
  *     allocation maps are updated in order.  For synchronous transactions,
  *     let the user thread finish processing after txUpdateMap() is called.
  */
-void txLazyCommit(struct tblock * tblk)
+static void txLazyCommit(struct tblock * tblk)
 {
        struct jfs_log *log;
 

diff --git a/fs/jfs/jfs_unicode.c b/fs/jfs/jfs_unicode.c
index c44ce40f506ae68323e705afd072258b994ca06e..ff67b61ceabc2cbbcaceade90205492c3a331138 100644 (file)
--- a/fs/jfs/jfs_unicode.c
+++ b/fs/jfs/jfs_unicode.c
@@ -78,8 +78,8 @@ int jfs_strfromUCS_le(char *to, const wchar_t * from, /* LITTLE ENDIAN */
  * FUNCTION:   Convert character string to unicode string
  *
  */
-int jfs_strtoUCS(wchar_t * to,
-                const char *from, int len, struct nls_table *codepage)
+static int jfs_strtoUCS(wchar_t * to, const char *from, int len,
+               struct nls_table *codepage)
 {
        int charlen;
        int i;

diff --git a/fs/jfs/jfs_xtree.c b/fs/jfs/jfs_xtree.c
index 3ff1672531bed5cc66b396fbcfaa8d9f11b18135..ae3bafe7b408fbae76caa26e17cac467cb316f37 100644 (file)
--- a/fs/jfs/jfs_xtree.c
+++ b/fs/jfs/jfs_xtree.c
@@ -1736,7 +1736,7 @@ int xtExtend(tid_t tid,           /* transaction id */
        return rc;
 }
 
-
+#ifdef _NOTYET
 /*
  *      xtTailgate()
  *
@@ -1918,7 +1918,7 @@ printf("xtTailgate: xoff:0x%lx xlen:0x%x xaddr:0x%lx\n",
 
        return rc;
 }
-
+#endif /* _NOTYET */
 
 /*
  *      xtUpdate()

diff --git a/fs/jfs/jfs_xtree.h b/fs/jfs/jfs_xtree.h
index 26588337cc01b102246276e3d17017417e0ce80b..7ae64d5986ee9cbc180d8b8ee5d06b398dce769e 100644 (file)
--- a/fs/jfs/jfs_xtree.h
+++ b/fs/jfs/jfs_xtree.h
@@ -117,8 +117,10 @@ extern int xtInsert(tid_t tid, struct inode *ip,
                    int xflag, s64 xoff, int xlen, s64 * xaddrp, int flag);
 extern int xtExtend(tid_t tid, struct inode *ip, s64 xoff, int xlen,
                    int flag);
+#ifdef _NOTYET
 extern int xtTailgate(tid_t tid, struct inode *ip,
                      s64 xoff, int xlen, s64 xaddr, int flag);
+#endif
 extern int xtUpdate(tid_t tid, struct inode *ip, struct xad *nxad);
 extern int xtDelete(tid_t tid, struct inode *ip, s64 xoff, int xlen,
                    int flag);

diff --git a/fs/jfs/namei.c b/fs/jfs/namei.c
index 472c43ebea1df11aa92b86ca0e31da4a67129e85..0e48668e00d7a48ae78768521cf51aa0534a5f05 100644 (file)
--- a/fs/jfs/namei.c
+++ b/fs/jfs/namei.c
@@ -44,7 +44,7 @@ extern int jfs_init_acl(struct inode *, struct inode *);
 struct inode_operations jfs_dir_inode_operations;
 struct file_operations jfs_dir_operations;
 
-s64 commitZeroLink(tid_t, struct inode *);
+static s64 commitZeroLink(tid_t, struct inode *);
 
 /*
  * NAME:       jfs_create(dip, dentry, mode)
@@ -60,7 +60,7 @@ s64 commitZeroLink(tid_t, struct inode *);
  * RETURN:     Errors from subroutines
  *
  */
-int jfs_create(struct inode *dip, struct dentry *dentry, int mode,
+static int jfs_create(struct inode *dip, struct dentry *dentry, int mode,
                struct nameidata *nd)
 {
        int rc = 0;
@@ -182,7 +182,7 @@ int jfs_create(struct inode *dip, struct dentry *dentry, int mode,
  * note:
  * EACCESS: user needs search+write permission on the parent directory
  */
-int jfs_mkdir(struct inode *dip, struct dentry *dentry, int mode)
+static int jfs_mkdir(struct inode *dip, struct dentry *dentry, int mode)
 {
        int rc = 0;
        tid_t tid;              /* transaction id */
@@ -316,7 +316,7 @@ int jfs_mkdir(struct inode *dip, struct dentry *dentry, int mode)
  * but the directory is not removed until the last reference to 
  * the directory is released (cf.unlink() of regular file).
  */
-int jfs_rmdir(struct inode *dip, struct dentry *dentry)
+static int jfs_rmdir(struct inode *dip, struct dentry *dentry)
 {
        int rc;
        tid_t tid;              /* transaction id */
@@ -439,7 +439,7 @@ int jfs_rmdir(struct inode *dip, struct dentry *dentry)
  * JFS does NOT support unlink() on directories.
  *
  */
-int jfs_unlink(struct inode *dip, struct dentry *dentry)
+static int jfs_unlink(struct inode *dip, struct dentry *dentry)
 {
        int rc;
        tid_t tid;              /* transaction id */
@@ -592,7 +592,7 @@ int jfs_unlink(struct inode *dip, struct dentry *dentry)
  *
  * RETURN:     Errors from subroutines
  */
-s64 commitZeroLink(tid_t tid, struct inode *ip)
+static s64 commitZeroLink(tid_t tid, struct inode *ip)
 {
        int filetype;
        struct tblock *tblk;
@@ -760,7 +760,7 @@ int freeZeroLink(struct inode *ip)
  * EXDEV: target object and new link are on different file systems and
  * implementation does not support links between file systems [XPG4.2].
  */
-int jfs_link(struct dentry *old_dentry,
+static int jfs_link(struct dentry *old_dentry,
             struct inode *dir, struct dentry *dentry)
 {
        int rc;
@@ -840,7 +840,8 @@ int jfs_link(struct dentry *old_dentry,
  * an intermediate result whose length exceeds PATH_MAX [XPG4.2]
 */
 
-int jfs_symlink(struct inode *dip, struct dentry *dentry, const char *name)
+static int jfs_symlink(struct inode *dip, struct dentry *dentry,
+               const char *name)
 {
        int rc;
        tid_t tid;
@@ -1045,7 +1046,7 @@ int jfs_symlink(struct inode *dip, struct dentry *dentry, const char *name)
  *
  * FUNCTION:    rename a file or directory
  */
-int jfs_rename(struct inode *old_dir, struct dentry *old_dentry,
+static int jfs_rename(struct inode *old_dir, struct dentry *old_dentry,
               struct inode *new_dir, struct dentry *new_dentry)
 {
        struct btstack btstack;
@@ -1313,7 +1314,8 @@ int jfs_rename(struct inode *old_dir, struct dentry *old_dentry,
  *
  * FUNCTION:    Create a special file (device)
  */
-int jfs_mknod(struct inode *dir, struct dentry *dentry, int mode, dev_t rdev)
+static int jfs_mknod(struct inode *dir, struct dentry *dentry,
+               int mode, dev_t rdev)
 {
        struct jfs_inode_info *jfs_ip;
        struct btstack btstack;

diff --git a/fs/jfs/super.c b/fs/jfs/super.c
index b63bd3aafd8423a75e30ffde38e5d10cbdbc3f81..6550cb0e1a25e0f8eb7545b67b0cb6463334d12e 100644 (file)
--- a/fs/jfs/super.c
+++ b/fs/jfs/super.c
@@ -321,7 +321,7 @@ cleanup:
        return 0;
 }
 
-int jfs_remount(struct super_block *sb, int *flags, char *data)
+static int jfs_remount(struct super_block *sb, int *flags, char *data)
 {
        s64 newLVSize = 0;
        int rc = 0;