xfs
[Top] [All Lists]

TAKE 904196 - merge back XFS changes from mainline

To: linux-xfs@xxxxxxxxxxx
Subject: TAKE 904196 - merge back XFS changes from mainline
From: nathans@xxxxxxx (Nathan Scott)
Date: Mon, 29 May 2006 16:06:23 +1000 (EST)
Sender: xfs-bounce@xxxxxxxxxxx
Merge back use of slab-spreading memory allocation flag use from mainline.

Date:  Mon May 29 14:58:51 AEST 2006
Workarea:  chook.melbourne.sgi.com:/build/nathans/xfs-linux
Inspected by:  pj

The following file(s) were checked into:
  longdrop.melbourne.sgi.com:/isms/xfs-kern/xfs-linux-melb


Modid:  xfs-linux-melb:xfs-kern:26068a
linux-2.6/kmem.h - 1.37 - changed
http://oss.sgi.com/cgi-bin/cvsweb.cgi/xfs-linux/linux-2.6/kmem.h.diff?r1=text&tr1=1.37&r2=text&tr2=1.36&f=h


Invalidate page loses its return code in 2.6.17, merge back from mainline.

Date:  Mon May 29 15:00:53 AEST 2006
Workarea:  chook.melbourne.sgi.com:/build/nathans/xfs-linux
Inspected by:  neilb

The following file(s) were checked into:
  longdrop.melbourne.sgi.com:/isms/xfs-kern/xfs-linux-melb


Modid:  xfs-linux-melb:xfs-kern:26069a
linux-2.6/xfs_aops.c - 1.125 - changed
http://oss.sgi.com/cgi-bin/cvsweb.cgi/xfs-linux/linux-2.6/xfs_aops.c.diff?r1=text&tr1=1.125&r2=text&tr2=1.124&f=h


get_block is replaced by get_blocks in 2.6.17, merge back my mainline update.

Date:  Mon May 29 15:07:44 AEST 2006
Workarea:  chook.melbourne.sgi.com:/build/nathans/xfs-linux
Inspected by:  badari

The following file(s) were checked into:
  longdrop.melbourne.sgi.com:/isms/xfs-kern/xfs-linux-melb


Modid:  xfs-linux-melb:xfs-kern:26070a
linux-2.6/xfs_iops.c - 1.247 - changed
http://oss.sgi.com/cgi-bin/cvsweb.cgi/xfs-linux/linux-2.6/xfs_iops.c.diff?r1=text&tr1=1.247&r2=text&tr2=1.246&f=h
linux-2.6/xfs_aops.c - 1.126 - changed
http://oss.sgi.com/cgi-bin/cvsweb.cgi/xfs-linux/linux-2.6/xfs_aops.c.diff?r1=text&tr1=1.126&r2=text&tr2=1.125&f=h
linux-2.6/xfs_aops.h - 1.6 - changed
http://oss.sgi.com/cgi-bin/cvsweb.cgi/xfs-linux/linux-2.6/xfs_aops.h.diff?r1=text&tr1=1.6&r2=text&tr2=1.5&f=h


Merge back a new include and GFP_NOWAIT mem alloc macro use from mainline.

Date:  Mon May 29 15:10:42 AEST 2006
Workarea:  chook.melbourne.sgi.com:/build/nathans/xfs-linux
Inspected by:  pj,clameter

The following file(s) were checked into:
  longdrop.melbourne.sgi.com:/isms/xfs-kern/xfs-linux-melb


Modid:  xfs-linux-melb:xfs-kern:26071a
linux-2.6/xfs_buf.c - 1.222 - changed
http://oss.sgi.com/cgi-bin/cvsweb.cgi/xfs-linux/linux-2.6/xfs_buf.c.diff?r1=text&tr1=1.222&r2=text&tr2=1.221&f=h


Pull back various small mainline tidbits - percpu api changes mainly.

Date:  Mon May 29 15:38:22 AEST 2006
Workarea:  chook.melbourne.sgi.com:/build/nathans/xfs-linux
Inspected by:  nathans

The following file(s) were checked into:
  longdrop.melbourne.sgi.com:/isms/xfs-kern/xfs-linux-melb


Modid:  xfs-linux-melb:xfs-kern:26073a
xfs_vnodeops.c - 1.674 - changed
http://oss.sgi.com/cgi-bin/cvsweb.cgi/xfs-linux/xfs_vnodeops.c.diff?r1=text&tr1=1.674&r2=text&tr2=1.673&f=h
linux-2.6/xfs_vnode.h - 1.117 - changed
http://oss.sgi.com/cgi-bin/cvsweb.cgi/xfs-linux/linux-2.6/xfs_vnode.h.diff?r1=text&tr1=1.117&r2=text&tr2=1.116&f=h
linux-2.6/xfs_stats.c - 1.22 - changed
http://oss.sgi.com/cgi-bin/cvsweb.cgi/xfs-linux/linux-2.6/xfs_stats.c.diff?r1=text&tr1=1.22&r2=text&tr2=1.21&f=h
linux-2.6/xfs_super.c - 1.364 - changed
http://oss.sgi.com/cgi-bin/cvsweb.cgi/xfs-linux/linux-2.6/xfs_super.c.diff?r1=text&tr1=1.364&r2=text&tr2=1.363&f=h
linux-2.6/xfs_sysctl.c - 1.37 - changed
http://oss.sgi.com/cgi-bin/cvsweb.cgi/xfs-linux/linux-2.6/xfs_sysctl.c.diff?r1=text&tr1=1.37&r2=text&tr2=1.36&f=h
linux-2.4/xfs_linux.h - 1.155 - changed
http://oss.sgi.com/cgi-bin/cvsweb.cgi/xfs-linux/linux-2.4/xfs_linux.h.diff?r1=text&tr1=1.155&r2=text&tr2=1.154&f=h


Merge back the splice support code I added directly into mainline.

Date:  Mon May 29 16:02:00 AEST 2006
Workarea:  chook.melbourne.sgi.com:/build/nathans/xfs-linux
Inspected by:  nathans

The following file(s) were checked into:
  longdrop.melbourne.sgi.com:/isms/xfs-kern/xfs-linux-melb


Modid:  xfs-linux-melb:xfs-kern:26074a
linux-2.6/xfs_lrw.h - 1.53 - changed
http://oss.sgi.com/cgi-bin/cvsweb.cgi/xfs-linux/linux-2.6/xfs_lrw.h.diff?r1=text&tr1=1.53&r2=text&tr2=1.52&f=h
linux-2.6/xfs_lrw.c - 1.241 - changed
http://oss.sgi.com/cgi-bin/cvsweb.cgi/xfs-linux/linux-2.6/xfs_lrw.c.diff?r1=text&tr1=1.241&r2=text&tr2=1.240&f=h
linux-2.6/xfs_linux.h - 1.145 - changed
http://oss.sgi.com/cgi-bin/cvsweb.cgi/xfs-linux/linux-2.6/xfs_linux.h.diff?r1=text&tr1=1.145&r2=text&tr2=1.144&f=h
linux-2.6/xfs_file.c - 1.135 - changed
http://oss.sgi.com/cgi-bin/cvsweb.cgi/xfs-linux/linux-2.6/xfs_file.c.diff?r1=text&tr1=1.135&r2=text&tr2=1.134&f=h
linux-2.6/xfs_vnode.h - 1.118 - changed
http://oss.sgi.com/cgi-bin/cvsweb.cgi/xfs-linux/linux-2.6/xfs_vnode.h.diff?r1=text&tr1=1.118&r2=text&tr2=1.117&f=h


Merge back the const struct file_operations change from mainline.

Date:  Mon May 29 16:05:50 AEST 2006
Workarea:  chook.melbourne.sgi.com:/build/nathans/xfs-linux
Inspected by:  nathans

The following file(s) were checked into:
  longdrop.melbourne.sgi.com:/isms/xfs-kern/xfs-linux-melb


Modid:  xfs-linux-melb:xfs-kern:26075a
linux-2.6/xfs_file.c - 1.136 - changed
http://oss.sgi.com/cgi-bin/cvsweb.cgi/xfs-linux/linux-2.6/xfs_file.c.diff?r1=text&tr1=1.136&r2=text&tr2=1.135&f=h
linux-2.6/xfs_iops.h - 1.29 - changed
http://oss.sgi.com/cgi-bin/cvsweb.cgi/xfs-linux/linux-2.6/xfs_iops.h.diff?r1=text&tr1=1.29&r2=text&tr2=1.28&f=h


<Prev in Thread] Current Thread [Next in Thread>
  • TAKE 904196 - merge back XFS changes from mainline, Nathan Scott <=