Last of the dir2 backmerges from Irix
Date: Tue Mar 4 15:51:58 PST 2003
Workarea:
stout.americas.sgi.com:/localhome/src/sandeen/2.4.x-xfs/workarea-modmerge
Merged by: sandeen
Merged mods: irix6.5f:irix:137928a,irix6.5f:irix:137929a,irix6.5f:irix:138887a
The following file(s) were checked into:
bonnie.engr.sgi.com:/isms/slinx/2.4.x-xfs
Modid: 2.4.x-xfs:slinx:140918a
linux/fs/xfs/xfs_dir2_node.c - 1.32
- Merge of irix6.5f:irix:137928a originally by overby on 02/04/03
Merge of grove2-6520stage:irix:137928a by roehrich.
Merge of cxfs-client2.5.0:irix:137928a by roehrich.
Merge of grove2:irix:137928a by roehrich.
Fix xfs_dir2_node_addname_int call to xfs_da_read_buf. Allow it to
return a
NULL buf pointer if the block isn't there.
Merge of irix6.5f:irix:137929a originally by overby on 02/04/03
Merge of grove2-6520stage:irix:137929a by roehrich.
Merge of cxfs-client2.5.0:irix:137929a by roehrich.
Merge of grove2:irix:137929a by roehrich.
in xfs_dir2_node_trim_free, make reading a nonexistant freespace block
a non-fatal error.
Merge of irix6.5f:irix:138887a originally by overby on 02/06/03
Merge of irix6.5m:irix:138887a by overby.
Check for a NULL freespace buffer pointer before calling
xfs_da_buf_done.
|