9ddb2a0090
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
2010-06-16 13:53:57 -07:00
38f71c17a7
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2010-06-16 13:53:55 -07:00
79eb4e31e5
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
2010-06-16 13:53:49 -07:00
2675df5773
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
2010-06-16 13:53:47 -07:00
e7afb0703f
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
2010-06-16 13:53:41 -07:00
6ed3b3141c
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
2010-06-16 13:53:39 -07:00
e86929bdc0
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
2010-06-16 13:53:34 -07:00
9cebf85651
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
2010-06-16 13:53:32 -07:00
35888a1fac
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
2010-06-16 13:53:26 -07:00
2084051282
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2010-06-16 13:53:24 -07:00
5b7970710a
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
2010-06-16 13:53:18 -07:00
2f10c62c32
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
2010-06-16 13:53:16 -07:00
9ba17b0b96
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
2010-06-16 13:53:11 -07:00
63b6a4437b
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
2010-06-16 13:53:09 -07:00
aacc00b961
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2010-06-16 13:53:08 -07:00
6a19e49908
Merge branch 'fix-branch' into refs/top-bases/zfs-branch
2010-06-16 13:53:07 -07:00
4c62777dcc
Merge commit 'refs/top-bases/fix-branch' into fix-branch
2010-06-16 13:49:56 -07:00
256505afb0
Merge branch 'fix-stack-dsl_deleg_get' into refs/top-bases/fix-branch
2010-06-16 13:49:55 -07:00
2709f5731b
New TopGit dependency: fix-stack-dsl_deleg_get
2010-06-16 13:49:53 -07:00
869764f64d
Add fix-stack-dsl_deleg_get topic branch
...
Reduce stack usage in dsl_deleg_get, gcc flagged it as consuming a
whopping 1040 bytes or potentially 1/4 of a 4K stack. This patch
moves all the large structures and buffer off the stack and on to
the heap. This includes 2 zap_cursor_t structs each 52 bytes in
size, 2 zap_attribute_t structs each 280 bytes in size, and 1
256 byte char array. The total saves on the stack is 880 bytes
after you account for the 5 new pointers added.
Also the source buffer length has been increased from MAXNAMELEN
to MAXNAMELEN+strlen(MOS_DIR_NAME)+1 as described by the comment in
dsl_dir_name(). A buffer overrun may have been possible with the
slightly smaller buffer.
2010-06-16 13:49:25 -07:00
bcadef704a
Merge branch 'linux-spa-thread' into refs/top-bases/linux-zfs-branch
2010-06-16 12:46:51 -07:00
e0776b63a4
Merge commit 'refs/top-bases/linux-spa-thread' into linux-spa-thread
2010-06-16 12:46:49 -07:00
c3104ed226
Merge branch 'linux-topology' into refs/top-bases/linux-zfs-branch
2010-06-16 12:46:43 -07:00
f957275c71
Merge commit 'refs/top-bases/linux-topology' into linux-topology
2010-06-16 12:46:41 -07:00
211a36dd21
Merge branch 'linux-sha2' into refs/top-bases/linux-zfs-branch
2010-06-16 12:46:36 -07:00
a91d8d6772
Merge commit 'refs/top-bases/linux-sha2' into linux-sha2
2010-06-16 12:46:34 -07:00
77b8a43605
Merge branch 'linux-user-util' into refs/top-bases/linux-zfs-branch
2010-06-16 12:46:29 -07:00
7e01470495
Merge commit 'refs/top-bases/linux-user-util' into linux-user-util
2010-06-16 12:46:27 -07:00
8a728b8706
Merge branch 'linux-debug-zerocopy' into refs/top-bases/linux-zfs-branch
2010-06-16 12:46:22 -07:00
b855fb237f
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2010-06-16 12:46:20 -07:00
fbe96f9ab0
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2010-06-16 12:46:19 -07:00
eb168a7372
Merge branch 'linux-events' into refs/top-bases/linux-zfs-branch
2010-06-16 12:46:10 -07:00
d30efbdef2
Merge commit 'refs/top-bases/linux-events' into linux-events
2010-06-16 12:46:08 -07:00
2790868791
Merge branch 'linux-kernel-device' into refs/top-bases/linux-zfs-branch
2010-06-16 12:46:03 -07:00
d67b0bd380
Merge commit 'refs/top-bases/linux-kernel-device' into linux-kernel-device
2010-06-16 12:46:01 -07:00
5b0f142dc6
Merge branch 'linux-have-idmap' into refs/top-bases/linux-zfs-branch
2010-06-16 12:45:56 -07:00
c7e65320a3
Merge commit 'refs/top-bases/linux-have-idmap' into linux-have-idmap
2010-06-16 12:45:54 -07:00
ce53465cc1
Merge branch 'linux-ztest' into refs/top-bases/linux-zfs-branch
2010-06-16 12:45:49 -07:00
629e615ed5
Merge commit 'refs/top-bases/linux-ztest' into linux-ztest
2010-06-16 12:45:46 -07:00
6bdb3a8d81
Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch
2010-06-16 12:45:41 -07:00
d014a8de68
Merge commit 'refs/top-bases/linux-unused' into linux-unused
2010-06-16 12:45:39 -07:00
bec2243801
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
2010-06-16 12:45:34 -07:00
4aa087e86d
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
2010-06-16 12:45:33 -07:00
daf7595b6e
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
2010-06-16 12:45:27 -07:00
0c636b03c0
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2010-06-16 12:45:25 -07:00
e5af44e277
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
2010-06-16 12:45:20 -07:00
97864d0f2d
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
2010-06-16 12:45:18 -07:00
e04d4fc5b9
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
2010-06-16 12:45:13 -07:00
9d96a1a63a
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
2010-06-16 12:45:11 -07:00
cf4e2ce240
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
2010-06-16 12:45:06 -07:00
Brian Behlendorf