A large number of mods just went into the 2.5 code base
Steve
------
remove unneeded locking implementation from dmapi
Date: Mon Jul 8 13:03:55 PDT 2002
Workarea: jen.americas.sgi.com:/src/lord/xfs-linux.2.5
Author: lord
Merged by: lord
Merged mods: 2.4.x-xfs:slinx:122496a
The following file(s) were checked into:
bonnie.engr.sgi.com:/isms/slinx/2.5.x-xfs
Modid: 2.5.x-xfs:slinx:122496a
linux/fs/xfs/support/sv.h - 1.8
linux/fs/xfs_dmapi/Makefile - 1.5
linux/fs/xfs_dmapi/sv.c - 1.2
linux/fs/xfs_dmapi/sv.h - 1.2
- Merge of 2.4.x-xfs:slinx:122496a by lord.
Subject: TAKE -
Date: Mon Jul 8 13:11:15 PDT 2002
Workarea: jen.americas.sgi.com:/src/lord/xfs-linux.2.5
Author: sandeen
Merged by: lord
Merged mods: 2.4.x-xfs:slinx:122557a
The following file(s) were checked into:
bonnie.engr.sgi.com:/isms/slinx/2.5.x-xfs
Modid: 2.5.x-xfs:slinx:122557a
linux/fs/xfs/xfs_inode.c - 1.343
- Merge of 2.4.x-xfs:slinx:122557a by lord.
Don't let CAP_DAC_OVERRIDE override if no execute bits are set
other minor cleanup in xfs_iaccess()
Subject: TAKE -
Date: Mon Jul 8 20:18:37 PDT 2002
Workarea: jen.americas.sgi.com:/src/lord/xfs-linux.2.5
Author: lord
Merged by: lord
Merged mods: 2.4.x-xfs:slinx:122661a
The following file(s) were checked into:
bonnie.engr.sgi.com:/isms/slinx/2.5.x-xfs
Modid: 2.5.x-xfs:slinx:122661a
linux/fs/xfs/xfs_vnodeops.c - 1.533
- Merge of 2.4.x-xfs:slinx:122661a by lord.
Add an iflush call which will initiate an inode flush to disk if it
can, otherwise return EAGAIN.
linux/fs/xfs/xfs_trans.c - 1.131
- Merge of 2.4.x-xfs:slinx:122661a by lord.
Mark the super block dirty after a transaction
linux/fs/xfs/linux/xfs_super.c - 1.200
- Merge of 2.4.x-xfs:slinx:122661a by lord.
change write_inode method to call into VOP_IFLUSH
linux/fs/xfs/linux/xfs_iops.c - 1.159
- Merge of 2.4.x-xfs:slinx:122661a by lord.
remove unneeded inode field updates, make more use of mark_inode_dirty
linux/fs/xfs/linux/xfs_vnode.h - 1.45
- Merge of 2.4.x-xfs:slinx:122661a by lord.
add VOP_IFLUSH
Subject: TAKE -
Date: Mon Jul 8 20:27:40 PDT 2002
Workarea: jen.americas.sgi.com:/src/lord/xfs-linux.2.5
Author: lord
Merged by: lord
Merged mods: 2.4.x-xfs:slinx:122666a
The following file(s) were checked into:
bonnie.engr.sgi.com:/isms/slinx/2.5.x-xfs
Modid: 2.5.x-xfs:slinx:122666a
linux/fs/xfs/xfs_rw.h - 1.65
linux/fs/xfs/xfs_rw.c - 1.361
linux/fs/xfs/xfs_vnodeops.c - 1.534
linux/fs/xfs/xfs_dfrag.c - 1.31
- Merge of 2.4.x-xfs:slinx:122666a by lord.
changes xfs_inval_cached_pages interface
linux/fs/xfs/linux/xfs_lrw.c - 1.150
- Merge of 2.4.x-xfs:slinx:122666a by lord.
move pagebuf_iozero here, relocate xfs stats here, change
xfs_inval_cached_pages interface
linux/fs/xfs/linux/xfs_file.c - 1.68
- Merge of 2.4.x-xfs:slinx:122666a by lord.
move xfs stats into xfs
linux/fs/xfs/pagebuf/page_buf_io.c - 1.41
linux/fs/xfs/pagebuf/page_buf.h - 1.26
- Merge of 2.4.x-xfs:slinx:122666a by lord.
remove pagebuf_iozero from here
Subject: TAKE -
Date: Tue Jul 9 13:02:50 PDT 2002
Workarea: jen.americas.sgi.com:/src/lord/xfs-linux.2.5
Author: lord
Merged by: lord
Merged mods: 2.4.x-xfs:slinx:122679a
The following file(s) were checked into:
bonnie.engr.sgi.com:/isms/slinx/2.5.x-xfs
Modid: 2.5.x-xfs:slinx:122679a
linux/mm/filemap.c - 1.124
- Merge of 2.4.x-xfs:slinx:122679a by lord.
break generic_file_write apart for use by xfs. Fix direct read end of
file handling.
linux/include/linux/fs.h - 1.179
- Merge of 2.4.x-xfs:slinx:122679a by lord.
prototype for do_generic_file_write
linux/fs/xfs/xfs_dmapi.c - 1.69
- Merge of 2.4.x-xfs:slinx:122679a by lord.
Get max direct I/O size from a different place
linux/fs/xfs/linux/xfs_lrw.c - 1.151
- Merge of 2.4.x-xfs:slinx:122679a by lord.
replace call to pagebuf_generic_file_write with do_generic_file_write.
linux/fs/xfs/linux/xfs_file.c - 1.69
- Merge of 2.4.x-xfs:slinx:122679a by lord.
since we now call the generic write path in xfs remove the checks
here which duplicate its functionality. Grab the i_sem lock in the
non O_DIRECT case, we need it in the vmtruncate call out of
do_generic_file_write.
linux/fs/xfs/linux/xfs_iops.c - 1.160
- Merge of 2.4.x-xfs:slinx:122679a by lord.
Add a truncate operation, change setattr to use vmtruncate and
not call inode_setattr
linux/fs/xfs/linux/xfs_ioctl.c - 1.72
- Merge of 2.4.x-xfs:slinx:122679a by lord.
Get max direct I/O size from a different place
linux/fs/xfs/pagebuf/page_buf_io.c - 1.42
- Merge of 2.4.x-xfs:slinx:122679a by lord.
remove write path
linux/fs/xfs/pagebuf/page_buf.c - 1.36
- Merge of 2.4.x-xfs:slinx:122679a by lord.
leave pages locked when reading it in.
linux/fs/xfs/pagebuf/page_buf.h - 1.27
- Merge of 2.4.x-xfs:slinx:122679a by lord.
remove prototypes
linux/fs/xfs/pagebuf/page_buf_internal.h - 1.11
- Merge of 2.4.x-xfs:slinx:122679a by lord.
remove direct I/O config option
Subject: TAKE -
Date: Tue Jul 9 13:06:49 PDT 2002
Workarea: jen.americas.sgi.com:/src/lord/xfs-linux.2.5
Author: lord
Merged by: lord
Merged mods: 2.4.x-xfs:slinx:122727a
The following file(s) were checked into:
bonnie.engr.sgi.com:/isms/slinx/2.5.x-xfs
Modid: 2.5.x-xfs:slinx:122727a
linux/fs/xfs/xfs_log_recover.c - 1.237
- Merge of 2.4.x-xfs:slinx:122727a by lord.
when allocating a buffer for recovery reading the log, use a power of
2
Subject: TAKE -
Date: Tue Jul 9 13:10:40 PDT 2002
Workarea: jen.americas.sgi.com:/src/lord/xfs-linux.2.5
Author: lord
Merged by: lord
Merged mods: 2.4.x-xfs:slinx:122683a
The following file(s) were checked into:
bonnie.engr.sgi.com:/isms/slinx/2.5.x-xfs
Modid: 2.5.x-xfs:slinx:122683a
linux/fs/xfs/linux/xfs_vnode.c - 1.89
- Merge of 2.4.x-xfs:slinx:122683a by lord.
small cleanup in generation number code
Subject: TAKE -
Date: Tue Jul 9 13:13:48 PDT 2002
Workarea: jen.americas.sgi.com:/src/lord/xfs-linux.2.5
Author: lord
Merged by: lord
Merged mods: 2.4.x-xfs:slinx:122684a
The following file(s) were checked into:
bonnie.engr.sgi.com:/isms/slinx/2.5.x-xfs
Modid: 2.5.x-xfs:slinx:122684a
linux/fs/xfs/linux/xfs_lrw.c - 1.152
- Merge of 2.4.x-xfs:slinx:122684a by lord.
rename pagebuf_iozero to xfs_iozero and change error sign to be
positive
Subject: TAKE -
update command version number info
Date: Tue Jul 9 13:18:11 PDT 2002
Workarea: jen.americas.sgi.com:/src/lord/xfs-linux.2.5
Author: lord
Merged by: lord
Merged mods: 2.4.x-xfs:slinx:122685a
The following file(s) were checked into:
bonnie.engr.sgi.com:/isms/slinx/2.5.x-xfs
Modid: 2.5.x-xfs:slinx:122685a
linux/Documentation/Changes - 1.53
- Merge of 2.4.x-xfs:slinx:122685a by lord.
Subject: TAKE -
Date: Tue Jul 9 13:48:37 PDT 2002
Workarea: jen.americas.sgi.com:/src/lord/xfs-linux.2.5
Author: sandeen
Merged by: lord
Merged mods: 2.4.x-xfs:slinx:122728a
The following file(s) were checked into:
bonnie.engr.sgi.com:/isms/slinx/2.5.x-xfs
Modid: 2.5.x-xfs:slinx:122728a
linux/fs/xfs/xfs_bmap.h - 1.77
linux/fs/xfs/xfs_bmap.c - 1.285
- Merge of 2.4.x-xfs:slinx:122728a by lord.
Change xfs_bmalloca_t to use chars instead of ints to reduce
stack usage; fix up associated functions.
linux/fs/xfs/linux/xfs_super.c - 1.201
- Merge of 2.4.x-xfs:slinx:122728a by lord.
Ease up on stack; allocate xfs_args struct for linvfs_read_super
and linvfs_remount
Subject: TAKE -
Date: Mon Jul 15 04:24:01 PDT 2002
Workarea: jen.americas.sgi.com:/src/lord/xfs-linux.2.5
Author: lord
Merged by: lord
Merged mods: 2.4.x-xfs:slinx:122739a
The following file(s) were checked into:
bonnie.engr.sgi.com:/isms/slinx/2.5.x-xfs
Modid: 2.5.x-xfs:slinx:122739a
linux/fs/xfs/linux/xfs_iops.c - 1.162
- Merge of 2.4.x-xfs:slinx:122739a by lord.
remove some page zeroing from the read path of getblock.
Subject: TAKE -
only include iobuf.h where needed
Date: Mon Jul 15 04:41:22 PDT 2002
Workarea: jen.americas.sgi.com:/src/lord/xfs-linux.2.5
Author: lord
Merged by: lord
Merged mods: 2.4.x-xfs:slinx:122766a
The following file(s) were checked into:
bonnie.engr.sgi.com:/isms/slinx/2.5.x-xfs
Modid: 2.5.x-xfs:slinx:122766a
linux/fs/xfs/linux/xfs_iops.c - 1.163
linux/fs/xfs/linux/xfs_ioctl.c - 1.74
linux/fs/xfs/pagebuf/page_buf.h - 1.29
- Merge of 2.4.x-xfs:slinx:122766a by lord.
Subject: TAKE -
use unlock_page instead of UnlockPage
Date: Mon Jul 15 05:05:41 PDT 2002
Workarea: jen.americas.sgi.com:/src/lord/xfs-linux.2.5
Author: lord
Merged by: lord
Merged mods: 2.4.x-xfs:slinx:122767a
The following file(s) were checked into:
bonnie.engr.sgi.com:/isms/slinx/2.5.x-xfs
Modid: 2.5.x-xfs:slinx:122767a
linux/fs/xfs/linux/xfs_lrw.c - 1.155
linux/fs/xfs/linux/xfs_iops.c - 1.164
linux/fs/xfs/pagebuf/page_buf_io.c - 1.44
linux/fs/xfs/pagebuf/page_buf.c - 1.38
- Merge of 2.4.x-xfs:slinx:122767a by lord.
Subject: TAKE -
do not pass file->f_flags into check frozen
Date: Mon Jul 15 05:07:56 PDT 2002
Workarea: jen.americas.sgi.com:/src/lord/xfs-linux.2.5
Author: lord
Merged by: lord
Merged mods: 2.4.x-xfs:slinx:122768a
The following file(s) were checked into:
bonnie.engr.sgi.com:/isms/slinx/2.5.x-xfs
Modid: 2.5.x-xfs:slinx:122768a
linux/fs/xfs/linux/xfs_lrw.c - 1.156
- Merge of 2.4.x-xfs:slinx:122768a by lord.
Subject: TAKE -
do not pass cwd into rmdir
Date: Mon Jul 15 05:20:08 PDT 2002
Workarea: jen.americas.sgi.com:/src/lord/xfs-linux.2.5
Author: lord
Merged by: lord
Merged mods: 2.4.x-xfs:slinx:122770a
The following file(s) were checked into:
bonnie.engr.sgi.com:/isms/slinx/2.5.x-xfs
Modid: 2.5.x-xfs:slinx:122770a
linux/fs/xfs/xfs_vnodeops.c - 1.536
linux/fs/xfs/linux/xfs_iops.c - 1.165
linux/fs/xfs/linux/xfs_vnode.h - 1.47
- Merge of 2.4.x-xfs:slinx:122770a by lord.
Subject: TAKE - rearrange dmapi mmap event trigger
Date: Mon Jul 15 05:31:56 PDT 2002
Workarea: jen.americas.sgi.com:/src/lord/xfs-linux.2.5
Author: roehrich
Merged by: lord
Merged mods: 2.4.x-xfs:slinx:122771a
The following file(s) were checked into:
bonnie.engr.sgi.com:/isms/slinx/2.5.x-xfs
Modid: 2.5.x-xfs:slinx:122771a
linux/mm/mprotect.c - 1.27
- Merge of 2.4.x-xfs:slinx:122771a by lord.
Remove call to f_op->dmapi_map_event().
Add call to f_op->mprotect().
linux/include/linux/fs.h - 1.181
- Merge of 2.4.x-xfs:slinx:122771a by lord.
Remove dmapi_map_event from file_operations.
Add mprotect to file_operations.
linux/fs/xfs/xfs_dmapi.h - 1.27
- Merge of 2.4.x-xfs:slinx:122771a by lord.
xfs_dmapi_mmap_event() prototype
linux/fs/xfs/xfs_dmapi.c - 1.71
- Merge of 2.4.x-xfs:slinx:122771a by lord.
Add xfs_dmapi_mmap_event(). This is the reincarnation of
linvfs_dmapi_map_event().
linux/fs/xfs/linux/xfs_dmistubs.c - 1.18
- Merge of 2.4.x-xfs:slinx:122771a by lord.
xfs_dmapi_mmap_event() stub
linux/fs/xfs/linux/xfs_file.c - 1.71
- Merge of 2.4.x-xfs:slinx:122771a by lord.
Remove linvfs_dmapi_map_event().
Add linvfs_mprotect().
Change linvfs_generic_file_mmap() to check for dmapi permission
_before_
doing the generic_file_mmap()...not much point in doing it after.
Subject: TAKE - add iobuf.h to xfs_dmapi.c
Date: Mon Jul 15 05:34:45 PDT 2002
Workarea: jen.americas.sgi.com:/src/lord/xfs-linux.2.5
Author: roehrich
Merged by: lord
Merged mods: 2.4.x-xfs:slinx:122778a
The following file(s) were checked into:
bonnie.engr.sgi.com:/isms/slinx/2.5.x-xfs
Modid: 2.5.x-xfs:slinx:122778a
linux/fs/xfs/xfs_dmapi.c - 1.72
- Merge of 2.4.x-xfs:slinx:122778a by lord.
add iobuf.h
Subject: TAKE - dmapi: introduce vnode ptr into dm_tokdata_t
This is the first of a series of patches to get the dmapi core to
use bhv's and bhv locks correctly. These patches are being carried
over from work currently going on for Irix, in PV 860655.
Date: Mon Jul 15 05:36:23 PDT 2002
Workarea: jen.americas.sgi.com:/src/lord/xfs-linux.2.5
Author: roehrich
Merged by: lord
Merged mods: 2.4.x-xfs:slinx:122813a
The following file(s) were checked into:
bonnie.engr.sgi.com:/isms/slinx/2.5.x-xfs
Modid: 2.5.x-xfs:slinx:122813a
linux/fs/xfs_dmapi/dmapi_right.c - 1.7
linux/fs/xfs_dmapi/dmapi_private.h - 1.13
linux/fs/xfs_dmapi/dmapi_event.c - 1.6
- Merge of 2.4.x-xfs:slinx:122813a by lord.
No Message Supplied
Subject: TAKE - dmapi: Change VN_HOLD/VN_RELE/iput to use the new vnode pointer
Date: Mon Jul 15 05:59:47 PDT 2002
Workarea: jen.americas.sgi.com:/src/lord/xfs-linux.2.5
Author: roehrich
Merged by: lord
Merged mods: 2.4.x-xfs:slinx:122818a
The following file(s) were checked into:
bonnie.engr.sgi.com:/isms/slinx/2.5.x-xfs
Modid: 2.5.x-xfs:slinx:122818a
linux/fs/xfs_dmapi/dmapi_right.c - 1.8
- Merge of 2.4.x-xfs:slinx:122818a by lord.
Change VN_HOLD/VN_RELE to use the new vnode pointer.
Subject: TAKE - dmapi: change dm_fsys_vector to use new vnode pointer
Date: Mon Jul 15 06:02:53 PDT 2002
Workarea: jen.americas.sgi.com:/src/lord/xfs-linux.2.5
Author: roehrich
Merged by: lord
Merged mods: 2.4.x-xfs:slinx:122821a
The following file(s) were checked into:
bonnie.engr.sgi.com:/isms/slinx/2.5.x-xfs
Modid: 2.5.x-xfs:slinx:122821a
linux/fs/xfs_dmapi/dmapi_right.c - 1.9
linux/fs/xfs_dmapi/dmapi_register.c - 1.19
linux/fs/xfs_dmapi/dmapi_region.c - 1.3
linux/fs/xfs_dmapi/dmapi_private.h - 1.14
linux/fs/xfs_dmapi/dmapi_mountinfo.c - 1.7
linux/fs/xfs_dmapi/dmapi_io.c - 1.3
linux/fs/xfs_dmapi/dmapi_hole.c - 1.3
linux/fs/xfs_dmapi/dmapi_handle.c - 1.3
linux/fs/xfs_dmapi/dmapi_event.c - 1.7
linux/fs/xfs_dmapi/dmapi_dmattr.c - 1.3
linux/fs/xfs_dmapi/dmapi_config.c - 1.4
linux/fs/xfs_dmapi/dmapi_bulkattr.c - 1.3
linux/fs/xfs_dmapi/dmapi_attr.c - 1.3
- Merge of 2.4.x-xfs:slinx:122821a by lord.
No Message Supplied
Subject: TAKE - rework mprotect handling (again)
Patch from Christoph Hellwig.
Summary:
* ->mprotect is not an operation on the fd but the vma, make it a VM
operation instead of file operation
* remove file argument from ->mprotect - it's always vma->vm_file
* define HAVE_VMOP_MPROTECT and make ->mprotect conditional on it
* simplify ->mmap, calling generic_file_mmap is pointless.
* rename linvfs_generic_file_mmap to linvfs_file_mmap
* add missing externs in xfs_dmapi.h
Date: Mon Jul 15 06:17:41 PDT 2002
Workarea: jen.americas.sgi.com:/src/lord/xfs-linux.2.5
Author: roehrich
Merged by: lord
Merged mods: 2.4.x-xfs:slinx:122842a
The following file(s) were checked into:
bonnie.engr.sgi.com:/isms/slinx/2.5.x-xfs
Modid: 2.5.x-xfs:slinx:122842a
linux/mm/mprotect.c - 1.28
linux/include/linux/mm.h - 1.91
linux/include/linux/fs.h - 1.182
linux/fs/xfs/xfs_dmapi.h - 1.28
linux/fs/xfs/xfs_dmapi.c - 1.73
linux/fs/xfs/linux/xfs_dmistubs.c - 1.19
linux/fs/xfs/linux/xfs_file.c - 1.72
- Merge of 2.4.x-xfs:slinx:122842a by lord.
Subject: TAKE - dmapi: add bhv locking at top of fsys_vector calls
Date: Mon Jul 15 06:27:44 PDT 2002
Workarea: jen.americas.sgi.com:/src/lord/xfs-linux.2.5
Author: roehrich
Merged by: lord
Merged mods: 2.4.x-xfs:slinx:122845a
The following file(s) were checked into:
bonnie.engr.sgi.com:/isms/slinx/2.5.x-xfs
Modid: 2.5.x-xfs:slinx:122845a
linux/fs/xfs_dmapi/dmapi_right.c - 1.10
linux/fs/xfs_dmapi/dmapi_register.c - 1.20
linux/fs/xfs_dmapi/dmapi_region.c - 1.4
linux/fs/xfs_dmapi/dmapi_io.c - 1.4
linux/fs/xfs_dmapi/dmapi_hole.c - 1.4
linux/fs/xfs_dmapi/dmapi_handle.c - 1.4
linux/fs/xfs_dmapi/dmapi_dmattr.c - 1.4
linux/fs/xfs_dmapi/dmapi_config.c - 1.5
linux/fs/xfs_dmapi/dmapi_bulkattr.c - 1.4
linux/fs/xfs_dmapi/dmapi_attr.c - 1.4
- Merge of 2.4.x-xfs:slinx:122845a by lord.
Subject: TAKE -
clean up the check frozen interface
Date: Mon Jul 15 06:32:21 PDT 2002
Workarea: jen.americas.sgi.com:/src/lord/xfs-linux.2.5
Author: lord
Merged by: lord
Merged mods: 2.4.x-xfs:slinx:122847a
The following file(s) were checked into:
bonnie.engr.sgi.com:/isms/slinx/2.5.x-xfs
Modid: 2.5.x-xfs:slinx:122847a
linux/fs/xfs/xfs_mount.h - 1.147
linux/fs/xfs/xfs_mount.c - 1.293
linux/fs/xfs/xfs_trans.c - 1.133
linux/fs/xfs/xfs_fsops.c - 1.81
linux/fs/xfs/linux/xfs_lrw.c - 1.157
- Merge of 2.4.x-xfs:slinx:122847a by lord.
Subject: TAKE -
fix comment
Date: Mon Jul 15 06:54:45 PDT 2002
Workarea: jen.americas.sgi.com:/src/lord/xfs-linux.2.5
Author: lord
Merged by: lord
Merged mods: 2.4.x-xfs:slinx:122850a
The following file(s) were checked into:
bonnie.engr.sgi.com:/isms/slinx/2.5.x-xfs
Modid: 2.5.x-xfs:slinx:122850a
linux/fs/xfs/xfs_mount.c - 1.294
- Merge of 2.4.x-xfs:slinx:122850a by lord.
Subject: TAKE -
remove VOP_CLOSE
Date: Mon Jul 15 06:59:38 PDT 2002
Workarea: jen.americas.sgi.com:/src/lord/xfs-linux.2.5
Author: lord
Merged by: lord
Merged mods: 2.4.x-xfs:slinx:122851a
The following file(s) were checked into:
bonnie.engr.sgi.com:/isms/slinx/2.5.x-xfs
Modid: 2.5.x-xfs:slinx:122851a
linux/fs/xfs/xfs_vnodeops.c - 1.537
linux/fs/xfs/linux/xfs_vnode.h - 1.48
- Merge of 2.4.x-xfs:slinx:122851a by lord.
Subject: TAKE -
rationalize mount arguments
Date: Mon Jul 15 07:06:30 PDT 2002
Workarea: jen.americas.sgi.com:/src/lord/xfs-linux.2.5
Author: lord
Merged by: lord
Merged mods: 2.4.x-xfs:slinx:122852a
The following file(s) were checked into:
bonnie.engr.sgi.com:/isms/slinx/2.5.x-xfs
Modid: 2.5.x-xfs:slinx:122852a
linux/fs/xfs/xfs_vfsops.c - 1.358
linux/fs/xfs/xfs_clnt.h - 1.32
linux/fs/xfs/xfs_mount.h - 1.148
linux/fs/xfs/linux/xfs_super.c - 1.203
linux/fs/xfs/linux/xfs_vfs.h - 1.21
- Merge of 2.4.x-xfs:slinx:122852a by lord.
Subject: TAKE -
change ih_lock to an read/write spin lock
Date: Mon Jul 15 07:08:41 PDT 2002
Workarea: jen.americas.sgi.com:/src/lord/xfs-linux.2.5
Author: lord
Merged by: lord
Merged mods: 2.4.x-xfs:slinx:122855a
The following file(s) were checked into:
bonnie.engr.sgi.com:/isms/slinx/2.5.x-xfs
Modid: 2.5.x-xfs:slinx:122855a
linux/fs/xfs/xfs_vnodeops.c - 1.538
linux/fs/xfs/xfs_iget.c - 1.165
linux/fs/xfs/xfs_inode.h - 1.163
- Merge of 2.4.x-xfs:slinx:122855a by lord.
Subject: TAKE -
Date: Mon Jul 15 08:12:47 PDT 2002
Workarea: jen.americas.sgi.com:/src/lord/xfs-linux.2.5
Author: lord
Merged by: lord
Merged mods: 2.4.x-xfs:slinx:122857a
The following file(s) were checked into:
bonnie.engr.sgi.com:/isms/slinx/2.5.x-xfs
Modid: 2.5.x-xfs:slinx:122857a
linux/fs/xfs/pagebuf/page_buf_locking.c - 1.19
- Merge of 2.4.x-xfs:slinx:122857a by lord.
Do determination of allowed request layouts at mount time
rather than at request time. Probably about a million less
tests this way.
linux/fs/xfs/pagebuf/page_buf.c - 1.39
- Merge of 2.4.x-xfs:slinx:122857a by lord.
More cleanup of page locking during read, also rationalize the
code in the I/O path which understands the layour restrictions
of specific device types.
linux/fs/xfs/pagebuf/page_buf.h - 1.30
- Merge of 2.4.x-xfs:slinx:122857a by lord.
add new flags field to pb_target structure
Subject: TAKE -
remove VOP_FCNTL - unused
Date: Mon Jul 15 08:15:31 PDT 2002
Workarea: jen.americas.sgi.com:/src/lord/xfs-linux.2.5
Author: lord
Merged by: lord
Merged mods: 2.4.x-xfs:slinx:122860a
The following file(s) were checked into:
bonnie.engr.sgi.com:/isms/slinx/2.5.x-xfs
Modid: 2.5.x-xfs:slinx:122860a
linux/fs/xfs/linux/xfs_vnode.h - 1.49
- Merge of 2.4.x-xfs:slinx:122860a by lord.
Subject: TAKE -
remove unused variables
Date: Mon Jul 15 08:17:09 PDT 2002
Workarea: jen.americas.sgi.com:/src/lord/xfs-linux.2.5
Author: lord
Merged by: lord
Merged mods: 2.4.x-xfs:slinx:122861a
The following file(s) were checked into:
bonnie.engr.sgi.com:/isms/slinx/2.5.x-xfs
Modid: 2.5.x-xfs:slinx:122861a
linux/fs/xfs/xfs_iget.c - 1.166
- Merge of 2.4.x-xfs:slinx:122861a by lord.
Subject: TAKE -
code shrink the create/mkdir/mknod path
Date: Mon Jul 15 08:19:29 PDT 2002
Workarea: jen.americas.sgi.com:/src/lord/xfs-linux.2.5
Author: lord
Merged by: lord
Merged mods: 2.4.x-xfs:slinx:122863a
The following file(s) were checked into:
bonnie.engr.sgi.com:/isms/slinx/2.5.x-xfs
Modid: 2.5.x-xfs:slinx:122863a
linux/fs/xfs/linux/xfs_iops.c - 1.166
linux/fs/xfs/linux/xfs_vnode.h - 1.50
- Merge of 2.4.x-xfs:slinx:122863a by lord.
Subject: TAKE -
fix snafu in last change
Date: Mon Jul 15 08:21:58 PDT 2002
Workarea: jen.americas.sgi.com:/src/lord/xfs-linux.2.5
Author: lord
Merged by: lord
Merged mods: 2.4.x-xfs:slinx:122873a
The following file(s) were checked into:
bonnie.engr.sgi.com:/isms/slinx/2.5.x-xfs
Modid: 2.5.x-xfs:slinx:122873a
linux/fs/xfs/linux/xfs_iops.c - 1.167
- Merge of 2.4.x-xfs:slinx:122873a by lord.
Subject: TAKE -
Date: Mon Jul 15 08:24:49 PDT 2002
Workarea: jen.americas.sgi.com:/src/lord/xfs-linux.2.5
Author: lord
Merged by: lord
Merged mods: 2.4.x-xfs:slinx:122932a
The following file(s) were checked into:
bonnie.engr.sgi.com:/isms/slinx/2.5.x-xfs
Modid: 2.5.x-xfs:slinx:122932a
linux/fs/xfs/xfsidbg.c - 1.192
linux/fs/xfs/xfs_vnodeops.c - 1.539
- Merge of 2.4.x-xfs:slinx:122932a by lord.
remove XFS_BIG_FILES ifdefs
linux/fs/xfs/xfs_bmap_btree.h - 1.52
- Merge of 2.4.x-xfs:slinx:122932a by lord.
Remove ifdefs for BMBT_USE_64
linux/fs/xfs/xfs_bmap_btree.c - 1.124
- Merge of 2.4.x-xfs:slinx:122932a by lord.
Remove ifdefs for BMBT_USE_64 and XFS_LARGE_FILES, optimize a lot of
endian conversion in the btree code
linux/fs/xfs/xfs_dir2_sf.c - 1.29
- Merge of 2.4.x-xfs:slinx:122932a by lord.
Fix debug build with XFS_BIG_FILESYSTEMS off
linux/fs/xfs/xfs_inode.h - 1.164
- Merge of 2.4.x-xfs:slinx:122932a by lord.
remove XFS_BIG_FILES ifdefs
linux/fs/xfs/xfs_types.h - 1.59
- Merge of 2.4.x-xfs:slinx:122932a by lord.
Remove XFS_BIG_FILES and set XFS_BIG_FILESYSTEMS to 0
linux/fs/xfs/xfs_bmap.c - 1.287
- Merge of 2.4.x-xfs:slinx:122932a by lord.
Remove ifdefs for BMBT_USE_64
Subject: TAKE -
fix compiler warnings
Date: Mon Jul 15 08:28:16 PDT 2002
Workarea: jen.americas.sgi.com:/src/lord/xfs-linux.2.5
Author: lord
Merged by: lord
Merged mods: 2.4.x-xfs:slinx:122953a
The following file(s) were checked into:
bonnie.engr.sgi.com:/isms/slinx/2.5.x-xfs
Modid: 2.5.x-xfs:slinx:122953a
linux/fs/xfs/xfs_rtalloc.c - 1.75
- Merge of 2.4.x-xfs:slinx:122953a by lord.
Subject: TAKE -
xfs does export symbols
Date: Mon Jul 15 08:30:55 PDT 2002
Workarea: jen.americas.sgi.com:/src/lord/xfs-linux.2.5
Author: lord
Merged by: lord
Merged mods: 2.4.x-xfs:slinx:122954a
The following file(s) were checked into:
bonnie.engr.sgi.com:/isms/slinx/2.5.x-xfs
Modid: 2.5.x-xfs:slinx:122954a
linux/fs/xfs/linux/xfs_super.c - 1.204
- Merge of 2.4.x-xfs:slinx:122954a by lord.
Subject: TAKE -
kill get_current_cred()
Date: Mon Jul 15 08:34:59 PDT 2002
Workarea: jen.americas.sgi.com:/src/lord/xfs-linux.2.5
Author: lord
Merged by: lord
Merged mods: 2.4.x-xfs:slinx:122955a
The following file(s) were checked into:
bonnie.engr.sgi.com:/isms/slinx/2.5.x-xfs
Modid: 2.5.x-xfs:slinx:122955a
linux/fs/xfs/xfs_dmapi.c - 1.74
linux/fs/xfs/linux/xfs_file.c - 1.73
linux/fs/xfs/linux/xfs_vnode.c - 1.91
linux/fs/xfs/linux/xfs_cred.h - 1.20
linux/fs/xfs/linux/xfs_ioctl.c - 1.75
linux/fs/xfs/xfs_acl.c - 1.31
linux/fs/xfs/xfs_cap.c - 1.5
- Merge of 2.4.x-xfs:slinx:122955a by lord.
Subject: TAKE -
Date: Mon Jul 15 08:40:01 PDT 2002
Workarea: jen.americas.sgi.com:/src/lord/xfs-linux.2.5
Author: lord
Merged by: lord
Merged mods: 2.4.x-xfs:slinx:122956a
The following file(s) were checked into:
bonnie.engr.sgi.com:/isms/slinx/2.5.x-xfs
Modid: 2.5.x-xfs:slinx:122956a
linux/fs/xfs/xfs_vnodeops.c - 1.540
- Merge of 2.4.x-xfs:slinx:122956a by lord.
remove xfs_allocstore and a call to vop_realvp
linux/fs/xfs/xfs_dir.c - 1.138
- Merge of 2.4.x-xfs:slinx:122956a by lord.
unneeded cell_capable ifdef
linux/fs/xfs/xfs_iocore.c - 1.32
- Merge of 2.4.x-xfs:slinx:122956a by lord.
remove xfs_checklock call
linux/fs/xfs/xfs_mount.h - 1.149
- Merge of 2.4.x-xfs:slinx:122956a by lord.
remove xfs_checklock from iocore
linux/fs/xfs/xfs_dir2.c - 1.35
- Merge of 2.4.x-xfs:slinx:122956a by lord.
unneeded cell_capable ifdef
linux/fs/xfs/linux/xfs_fs_subr.c - 1.34
- Merge of 2.4.x-xfs:slinx:122956a by lord.
remove fs_vnode_change and symbol exports
linux/fs/xfs/linux/xfs_vnode.h - 1.51
- Merge of 2.4.x-xfs:slinx:122956a by lord.
allocstore and realvp removed
linux/fs/xfs/linux/xfs_fs_subr.h - 1.8
- Merge of 2.4.x-xfs:slinx:122956a by lord.
remove fs_vnode_change prototype
Subject: TAKE -
debug build fix
Date: Mon Jul 15 08:42:46 PDT 2002
Workarea: jen.americas.sgi.com:/src/lord/xfs-linux.2.5
Author: lord
Merged by: lord
Merged mods: 2.4.x-xfs:slinx:122962a
The following file(s) were checked into:
bonnie.engr.sgi.com:/isms/slinx/2.5.x-xfs
Modid: 2.5.x-xfs:slinx:122962a
linux/fs/xfs/xfs_fs.h - 1.1
linux/fs/xfs/xfs_dir2_sf.c - 1.30
- Merge of 2.4.x-xfs:slinx:122962a by lord.
Subject: TAKE -
Date: Mon Jul 15 08:51:46 PDT 2002
Workarea: jen.americas.sgi.com:/src/lord/xfs-linux.2.5
Merged by: lord
Merged mods:
2.4.x-xfs:slinx:122963a,2.4.x-xfs:slinx:122969a,2.4.x-xfs:slinx:122970a
The following file(s) were checked into:
bonnie.engr.sgi.com:/isms/slinx/2.5.x-xfs
Modid: 2.5.x-xfs:slinx:123014a
linux/fs/xfs/linux/xfs_linux.h - 1.80
- Merge of 2.4.x-xfs:slinx:122970a originally by lord on 07/12/02
move dmapi includes out of here
linux/include/linux/xfs_fs.h - 1.36
- Merge of 2.4.x-xfs:slinx:122963a originally by lord on 07/12/02
move xfs_fs.h
linux/fs/xfs/xfs.h - 1.26
- Merge of 2.4.x-xfs:slinx:122969a originally by lord on 07/12/02
include xfs_fs.h here
linux/fs/xfs/pagebuf/page_buf.c - 1.40
- Merge of 2.4.x-xfs:slinx:122963a originally by lord on 07/12/02
move xfs_fs.h
Subject: TAKE -
Date: Mon Jul 15 08:54:54 PDT 2002
Workarea: jen.americas.sgi.com:/src/lord/xfs-linux.2.5
Author: nathans
Merged by: lord
Merged mods: 2.4.x-xfs:slinx:122997a
The following file(s) were checked into:
bonnie.engr.sgi.com:/isms/slinx/2.5.x-xfs
Modid: 2.5.x-xfs:slinx:122997a
linux/fs/xfs/xfs_types.h - 1.60
- Merge of 2.4.x-xfs:slinx:122997a by lord.
allow setting for XFS_BIG_FILESYSTEMS to come in from the Makefile.
Subject: TAKE -
remove xfs_rsync_fn, not used
Date: Mon Jul 15 08:57:48 PDT 2002
Workarea: jen.americas.sgi.com:/src/lord/xfs-linux.2.5
Author: lord
Merged by: lord
Merged mods: 2.4.x-xfs:slinx:123003a
The following file(s) were checked into:
bonnie.engr.sgi.com:/isms/slinx/2.5.x-xfs
Modid: 2.5.x-xfs:slinx:123003a
linux/fs/xfs/xfs_iocore.c - 1.33
- Merge of 2.4.x-xfs:slinx:123003a by lord.
|