[BACK]Return to ext2_alloc.c CVS log [TXT] [DIR] Up to [DragonFly] / src / sys / vfs / gnu / ext2fs

Diff for /src/sys/vfs/gnu/ext2fs/ext2_alloc.c between versions 1.5 and 1.6

version 1.5, 2003/08/20 09:56:31 version 1.6, 2004/04/08 20:57:52
Line 73  static void ext2_fserr (struct ext2_sb_i Line 73  static void ext2_fserr (struct ext2_sb_i
  * the call in vfree might be redundant   * the call in vfree might be redundant
  */   */
 void  void
 ext2_discard_prealloc(ip)  ext2_discard_prealloc(struct inode *ip)
         struct inode * ip;  
 {  {
 #ifdef EXT2_PREALLOCATE  #ifdef EXT2_PREALLOCATE
         if (ip->i_prealloc_count) {          if (ip->i_prealloc_count) {
Line 99  ext2_discard_prealloc(ip) Line 98  ext2_discard_prealloc(ip)
  * preallocation is done as Linux does it   * preallocation is done as Linux does it
  */   */
 int  int
 ext2_alloc(ip, lbn, bpref, size, cred, bnp)  ext2_alloc(struct inode *ip, daddr_t lbn, daddr_t bpref, int size,
         struct inode *ip;             struct ucred *cred, daddr_t *bnp)
         daddr_t lbn, bpref;  
         int size;  
         struct ucred *cred;  
         daddr_t *bnp;  
 {  {
         struct ext2_sb_info *fs;          struct ext2_sb_info *fs;
         daddr_t bno;          daddr_t bno;
Line 214  SYSCTL_INT(_debug, 14, doasyncfree, CTLF Line 209  SYSCTL_INT(_debug, 14, doasyncfree, CTLF
 #endif  /* OPT_DEBUG */  #endif  /* OPT_DEBUG */
 #endif  #endif
   
   /*
    * ext2_reallocblks(struct vnode *a_vp, struct cluster_save *a_buflist)
    */
 int  int
 ext2_reallocblks(ap)  ext2_reallocblks(struct vop_reallocblks_args *ap)
         struct vop_reallocblks_args /* {  
                 struct vnode *a_vp;  
                 struct cluster_save *a_buflist;  
         } */ *ap;  
 {  {
 #ifndef FANCY_REALLOC  #ifndef FANCY_REALLOC
 /* printf("ext2_reallocblks not implemented\n"); */  /* printf("ext2_reallocblks not implemented\n"); */
Line 376  fail: Line 370  fail:
  * ext2_new_inode(), to make sure we get the policies right   * ext2_new_inode(), to make sure we get the policies right
  */   */
 int  int
 ext2_valloc(pvp, mode, cred, vpp)  ext2_valloc(struct vnode *pvp, int mode, struct ucred *cred, struct vnode **vpp)
         struct vnode *pvp;  
         int mode;  
         struct ucred *cred;  
         struct vnode **vpp;  
 {  {
         struct inode *pip;          struct inode *pip;
         struct ext2_sb_info *fs;          struct ext2_sb_info *fs;
Line 451  noinodes: Line 441  noinodes:
  * that will hold the pointer   * that will hold the pointer
  */   */
 daddr_t  daddr_t
 ext2_blkpref(ip, lbn, indx, bap, blocknr)  ext2_blkpref(struct inode *ip, daddr_t lbn, int indx, daddr_t *bap,
         struct inode *ip;               daddr_t blocknr)
         daddr_t lbn;  
         int indx;  
         daddr_t *bap;  
         daddr_t blocknr;  
 {  {
         int     tmp;          int     tmp;
   
Line 489  ext2_blkpref(ip, lbn, indx, bap, blocknr Line 475  ext2_blkpref(ip, lbn, indx, bap, blocknr
  * pass on to the Linux code   * pass on to the Linux code
  */   */
 void  void
 ext2_blkfree(ip, bno, size)  ext2_blkfree(struct inode *ip, daddr_t bno, long size)
         struct inode *ip;  
         daddr_t bno;  
         long size;  
 {  {
         struct ext2_sb_info *fs;          struct ext2_sb_info *fs;
   
Line 509  ext2_blkfree(ip, bno, size) Line 492  ext2_blkfree(ip, bno, size)
  * the maintenance of the actual bitmaps is again up to the linux code   * the maintenance of the actual bitmaps is again up to the linux code
  */   */
 int  int
 ext2_vfree(pvp, ino, mode)  ext2_vfree(struct vnode *pvp, ino_t ino, int mode)
         struct vnode *pvp;  
         ino_t ino;  
         int mode;  
 {  {
         struct ext2_sb_info *fs;          struct ext2_sb_info *fs;
         struct inode *pip;          struct inode *pip;
Line 547  ext2_vfree(pvp, ino, mode) Line 527  ext2_vfree(pvp, ino, mode)
  *      fs: error message   *      fs: error message
  */   */
 static void  static void
 ext2_fserr(fs, uid, cp)  ext2_fserr(struct ext2_sb_info *fs, u_int uid, char *cp)
         struct ext2_sb_info *fs;  
         u_int uid;  
         char *cp;  
 {  {
   
         log(LOG_ERR, "uid %d on %s: %s\n", uid, fs->fs_fsmnt, cp);          log(LOG_ERR, "uid %d on %s: %s\n", uid, fs->fs_fsmnt, cp);
 }  }
Removed from v.1.5  
changed lines
  Added in v.1.6