Paul Mackerras
de2d3dbd17
Merge ../linux-2.6
2005-11-02 15:20:55 +11:00
Paul Mackerras
104dd65fef
powerpc: clean up bug.h further
...
This simplifies the macros which are different between 32-bit and
64-bit. It also fixes a couple of printks on the bug->line element,
which is now a long.
Signed-off-by: Paul Mackerras <paulus@samba.org>
2005-11-02 15:19:47 +11:00
Paul Mackerras
b5ca71a58b
Merge git://oak/home/sfr/kernels/iseries/work
2005-11-02 15:14:44 +11:00
Nathan Scott
19d5bcf370
[XFS] Ensure fsync does not incorrectly return EIO for pages beyond EOF.
...
SGI-PV: 944819
SGI-Modid: xfs-linux:xfs-kern:24236a
Signed-off-by: Nathan Scott <nathans@sgi.com>
2005-11-02 15:14:09 +11:00
Kelly Daly
b420677870
merge filename and modify references to iseries/vio.h
...
Signed-off-by: Kelly Daly <kelly@au.ibm.com>
2005-11-02 15:13:57 +11:00
Eric Sandeen
a749ee8615
[XFS] Fix calculation of reserved AGs for inodes in 32-bit inode mode
...
Spotted by Roger Willcocks <willcor @at@ gmail.com>
SGI-PV: 944858
SGI-Modid: xfs-linux:xfs-kern:201213a
Signed-off-by: Eric Sandeen <sandeen@sgi.com>
Signed-off-by: Nathan Scott <nathans@sgi.com>
2005-11-02 15:13:42 +11:00
Nathan Scott
fdc7ed75c0
[XFS] Fix boundary conditions when issuing direct IOs from large userspace
...
buffers.
SGI-PV: 944820
SGI-Modid: xfs-linux:xfs-kern:24223a
Signed-off-by: Nathan Scott <nathans@sgi.com>
2005-11-02 15:13:13 +11:00
Nathan Scott
2b3b6d07f7
[XFS] Remove an unhelpful ifdef, the comment above the routine explains
...
the purpose well enough here.
SGI-PV: 944821
SGI-Modid: xfs-linux:xfs-kern:24214a
Signed-off-by: Nathan Scott <nathans@sgi.com>
2005-11-02 15:12:28 +11:00
Nathan Scott
cfcbbbd089
[XFS] Remove old, broken nolog-mode code - noone plans to ever fix it.
...
SGI-PV: 944821
SGI-Modid: xfs-linux:xfs-kern:24213a
Signed-off-by: Nathan Scott <nathans@sgi.com>
2005-11-02 15:12:04 +11:00
Nathan Scott
c11e2c369d
[XFS] Rework fid encode/decode wrt 64 bit inums interacting with NFS.
...
SGI-PV: 937127
SGI-Modid: xfs-linux:xfs-kern:24201a
Signed-off-by: Nathan Scott <nathans@sgi.com>
2005-11-02 15:11:45 +11:00
Christoph Hellwig
16259e7d95
[XFS] Endianess annotations for various allocator data structures
...
SGI-PV: 943272
SGI-Modid: xfs-linux:xfs-kern:201006a
Signed-off-by: Christoph Hellwig <hch@sgi.com>
Signed-off-by: Nathan Scott <nathans@sgi.com>
2005-11-02 15:11:25 +11:00
Eric Sandeen
e2ed81fbbb
[XFS] remove unused code from xfs_iomap_write_direct
...
SGI-PV: 943266
SGI-Modid: xfs-linux:xfs-kern:200996a
Signed-off-by: Eric Sandeen <sandeen@sgi.com>
Signed-off-by: Nathan Scott <nathans@sgi.com>
2005-11-02 15:10:55 +11:00
Eric Sandeen
e94af02a9c
[XFS] fix old xfs_setattr mis-merge from irix; mostly harmless esp if not
...
using xfs rt
SGI-PV: 944632
SGI-Modid: xfs-linux:xfs-kern:200983a
Signed-off-by: Eric Sandeen <sandeen@sgi.com>
Signed-off-by: Nathan Scott <nathans@sgi.com>
2005-11-02 15:10:41 +11:00
Kelly Daly
bbc8b628b0
merge filename and modify references to iSeries/mf.h
...
Signed-off-by: Kelly Daly <kelly@au.ibm.com>
2005-11-02 15:10:38 +11:00
Yingping Lu
91e11088f8
[XFS] Fixing size report discrepancy between ls and du caused by xfs_fsr
...
SGI-PV: 943908
SGI-Modid: xfs-linux:xfs-kern:200874a
Signed-off-by: Yingping Lu <yingping@sgi.com>
Signed-off-by: Nathan Scott <nathans@sgi.com>
2005-11-02 15:10:24 +11:00
Yingping Lu
9af0a70c07
[XFS] Fixed a bug in reporting extent list for attribute fork running
...
xfs_bmap -a.
SGI-PV: 944075
SGI-Modid: xfs-linux:xfs-kern:200860a
Signed-off-by: Yingping Lu <yingping@sgi.com>
Signed-off-by: Nathan Scott <nathans@sgi.com>
2005-11-02 15:09:54 +11:00
Christoph Hellwig
7f14d0a013
[XFS] Simplify pagebuf_rele Remove a conditional that can not be true
...
anymore and simplify the final put path a little
SGI-PV: 908809
SGI-Modid: xfs-linux:xfs-kern:200790a
Signed-off-by: Christoph Hellwig <hch@sgi.com>
Signed-off-by: Nathan Scott <nathans@sgi.com>
2005-11-02 15:09:35 +11:00
Nathan Scott
e718eeb4fe
[XFS] Rework the final mount options flag bit to make room for more.
...
SGI-PV: 943866
SGI-Modid: xfs-linux:xfs-kern:24030a
Signed-off-by: Nathan Scott <nathans@sgi.com>
2005-11-02 15:09:22 +11:00
Nathan Scott
6b3f6b5b87
[XFS] Rework the dquot hash sizing heuristics.
...
SGI-PV: 943123
SGI-Modid: xfs-linux:xfs-kern:24012a
Signed-off-by: Nathan Scott <nathans@sgi.com>
2005-11-02 15:08:25 +11:00
Paul Mackerras
a000503471
powerpc: exclude powerbook sleep code with CONFIG_PPC64 and CONFIG_PM
...
We were getting powerbook sleep code included, and giving compile
errors, with CONFIG_PM=y on a 64-bit build. This excludes that code
so the kernel will compile. One day BenH will implement on sleep on
the G5...
Signed-off-by: Paul Mackerras <paulus@samba.org>
2005-11-02 15:08:17 +11:00
Eric Sandeen
1f730e3b53
[XFS] Add ATTR_NOSIZETOK definition for xfs_vnodeops.c change
...
SGI-PV: 942439
SGI-Modid: xfs-linux:xfs-kern:200185a
Signed-off-by: Eric Sandeen <sandeen@sgi.com>
Signed-off-by: Nathan Scott <nathans@sgi.com>
2005-11-02 15:08:10 +11:00
Kelly Daly
6cbbdabb01
merge filename and modify references to iseries/iseries_io.h
...
Signed-off-by: Kelly Daly <kelly@au.ibm.com>
2005-11-02 15:07:51 +11:00
Nathan Scott
8a319ae494
[XFS] Disable attr2 by default, until a more appropriate time to enable
...
it.
SGI-PV: 941645
SGI-Modid: xfs-linux:xfs-kern:24002a
Signed-off-by: Nathan Scott <nathans@sgi.com>
2005-11-02 15:07:51 +11:00
Eric Sandeen
374e2ac337
[XFS] Prevent data corruption on extending truncate case from cxfs client
...
SGI-PV: 942439
SGI-Modid: xfs-linux:xfs-kern:200152a
Signed-off-by: Eric Sandeen <sandeen@sgi.com>
Signed-off-by: Nathan Scott <nathans@sgi.com>
2005-11-02 15:07:34 +11:00
Christoph Hellwig
4750ddb0ba
[XFS] Fix sparse warnings in ktrace.[ch]
...
SGI-PV: 943556
SGI-Modid: xfs-linux:xfs-kern:200113a
Signed-off-by: Christoph Hellwig <hch@sgi.com>
Signed-off-by: Nathan Scott <nathans@sgi.com>
2005-11-02 15:07:23 +11:00
Paul Mackerras
bccfd58842
powerpc: Fix compile error with CONFIG_TAU=y
...
A couple of instances of "i" that needed to be changed to "cpu_id"
got missed in the merge, because they were in CONFIG_TAU code.
Signed-off-by: Paul Mackerras <paulus@samba.org>
2005-11-02 15:06:22 +11:00
Christoph Hellwig
5bde1ba99c
[XFS] silence gcc4 warnings. the directory ones are wrong because of
...
information gcc could not find out (that a directory always has a ..
entry), the others are outright gcc bugs.
SGI-PV: 943511
SGI-Modid: xfs-linux:xfs-kern:200055a
Signed-off-by: Christoph Hellwig <hch@sgi.com>
Signed-off-by: Nathan Scott <nathans@sgi.com>
2005-11-02 15:06:18 +11:00
Nathan Scott
9dac13e7ff
[XFS] Remove unused type, xfs_gap_t.
...
SGI-PV: 907752
SGI-Modid: xfs-linux:xfs-kern:23932a
Signed-off-by: Nathan Scott <nathans@sgi.com>
2005-11-02 15:05:34 +11:00
Paul Mackerras
19fa17e5b1
powerpc: Use rtas_call not call_rtas in CHRP code
...
The nvram driver imported from the ppc code uses call_rtas, but
rtas_call is the name we are using in merged code (since ppc64 used
that name, and it uses far more RTAS calls than ppc32).
Signed-off-by: Paul Mackerras <paulus@samba.org>
2005-11-02 15:04:26 +11:00
Kelly Daly
c43a55ff4e
merge filename and modify references to iseries/lpar_map.h
...
Signed-off-by: Kelly Daly <kelly@au.ibm.com>
2005-11-02 15:02:47 +11:00
Al Viro
f2cad7a8cd
[PATCH] ppc bug.h namespace pollution
...
DATA_TYPE is really not a good thing to put into header that
gets included all over the tree...
Just make the cast always (long) and get rid of DATA_TYPE altogether.
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Paul Mackerras <paulus@samba.org>
2005-11-02 15:01:30 +11:00
Christoph Hellwig
1149d96ae8
[XFS] endianess annotations and cleanup for the quota code
...
SGI-PV: 943272
SGI-Modid: xfs-linux:xfs-kern:199767a
Signed-off-by: Christoph Hellwig <hch@sgi.com>
Signed-off-by: Nathan Scott <nathans@sgi.com>
2005-11-02 15:01:12 +11:00
Nathan Scott
fa7e7d71e0
[XFS] Show additional mount options in /proc/mounts, fix up some debug
...
code.
SGI-PV: 941645
SGI-Modid: xfs-linux:xfs-kern:23926a
Signed-off-by: Nathan Scott <nathans@sgi.com>
2005-11-02 15:00:48 +11:00
Nathan Scott
da087bad81
[XFS] Fix up a 32/64 local flags variable issue when enabling attr2 mode.
...
SGI-PV: 941645
SGI-Modid: xfs-linux:xfs-kern:23925a
Signed-off-by: Nathan Scott <nathans@sgi.com>
2005-11-02 15:00:20 +11:00
Eric Sandeen
0116d9356b
[XFS] Remove dead code in xfs_iomap_write_direct; save some stack
...
SGI-PV: 943266
SGI-Modid: xfs-linux:xfs-kern:199750a
Signed-off-by: Eric Sandeen <sandeen@sgi.com>
Signed-off-by: Nathan Scott <nathans@sgi.com>
2005-11-02 15:00:01 +11:00
Nathan Scott
4ce3121f67
[XFS] Update license/copyright notices to match the prefered SGI
...
boilerplate.
SGI-PV: 913862
SGI-Modid: xfs-linux:xfs-kern:23917a
Signed-off-by: Nathan Scott <nathans@sgi.com>
2005-11-02 14:59:41 +11:00
Nathan Scott
7b71876980
[XFS] Update license/copyright notices to match the prefered SGI
...
boilerplate.
SGI-PV: 913862
SGI-Modid: xfs-linux:xfs-kern:23903a
Signed-off-by: Nathan Scott <nathans@sgi.com>
2005-11-02 14:58:39 +11:00
Kelly Daly
59ce20bb34
merge filename and modify references to iseries/it_lp_reg_save.h
...
Signed-off-by: Kelly Daly <kelly@au.ibm.com>
2005-11-02 14:49:47 +11:00
David Gibson
2ff2ae7a0d
[PATCH] powerpc: Merge futex.h
...
This patch merges the ppc32 and ppc64 versions of futex.h, essentially
by taking the ppc64 version as the powerpc version. The old ppc32
version did not implement the futex_atomic_op_inuser() callback (it
always returned -ENOSYS), so FUTEX_WAKE_OP would not work on ppc32.
In fact the ppc64 version of this function is almost suitable for
ppc32 as well - the only change needed is to extend ppc_asm.h with a
macro expanding to to the right pseudo-op to store a pointer (either
".long" or ".llong").
Built and booted on pSeries. Built for 32-bit powermac.
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
Signed-off-by: Paul Mackerras <paulus@samba.org>
2005-11-02 14:48:18 +11:00
David Gibson
847aeb6bad
[PATCH] powerpc: Fix merged ipcbuf.h
...
Oops, when merging ipcbuf.h, I forgot that 'u64' can't be used in
user-visible headers. This patch corrects the problem, replacing the
unused fields with an array of four __u32s.
Signed-off-by: David Gibson <dwg@au1.ibm.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>
2005-11-02 14:48:05 +11:00
Nathan Scott
a844f4510d
[XFS] Remove xfs_macros.c, xfs_macros.h, rework headers a whole lot.
...
SGI-PV: 943122
SGI-Modid: xfs-linux:xfs-kern:23901a
Signed-off-by: Nathan Scott <nathans@sgi.com>
2005-11-02 14:38:42 +11:00
Kelly Daly
8875ccfb7a
merge filename and modify references to iseries/it_lp_queue.h
...
Signed-off-by: Kelly Daly <kelly@au.ibm.com>
2005-11-02 14:13:34 +11:00
Kelly Daly
f218aab5cf
merge filename and modify references to iseries/it_lp_naca.h
...
Signed-off-by: Kelly Daly <kelly@au.ibm.com>
2005-11-02 13:51:41 +11:00
Kelly Daly
7b487bb801
merge filename and modify references to iseries/it_exp_vpd_panel.h
...
Signed-off-by: Kelly Daly <kelly@au.ibm.com>
2005-11-02 13:48:25 +11:00
Kelly Daly
1ec65d76f3
merge filename and modify references to iseries/hv_types.h
...
Signed-off-by: Kelly Daly <kelly@au.ibm.com>
2005-11-02 13:46:07 +11:00
Kelly Daly
e45423eac2
merge filename and modify references to iseries/hv_lp_event.h
...
Signed-off-by: Kelly Daly <kelly@au.ibm.com>
2005-11-02 12:08:31 +11:00
Kelly Daly
15b1718948
merge filename and modify reference to iseries/hv_lp_config.h
...
Signed-off-by: Kelly Daly <kelly@au.ibm.com>
2005-11-02 11:55:28 +11:00
Christoph Hellwig
61c1e689fb
[XFS] remove unused struct xfs_ail_ticket
...
SGI-PV: 919278
SGI-Modid: xfs-linux:xfs-kern:199498a
Signed-off-by: Christoph Hellwig <hch@sgi.com>
Signed-off-by: Nathan Scott <nathans@sgi.com>
2005-11-02 11:44:57 +11:00
Nathan Scott
fc1f8c1ca3
[XFS] Track external log/realtime device names for correct reporting in
...
/proc/mounts.
SGI-PV: 942984
SGI-Modid: xfs-linux:xfs-kern:23862a
Signed-off-by: Nathan Scott <nathans@sgi.com>
2005-11-02 11:44:33 +11:00
Nathan Scott
4aeb664c25
[XFS] Improve buffered read throughput by removing unnecessary timer calls
...
that showed in ´kernel profiles.
SGI-PV: 925163
SGI-Modid: xfs-linux:xfs-kern:23861a
Signed-off-by: Nathan Scott <nathans@sgi.com>
2005-11-02 11:43:58 +11:00