Rebased ref, commits from common ancestor:
3bfb98694a6c78e72584ec16a30523c4508a2516 Unionfs: bugfix when renaming symlinks
on readonly branches
366971ef56bb59cbcf0468a8c8c7d9090eb56ee9 Unionfs: rename file->f_dentry
references to file->f_path.dentry
7317d11592002f25f783341e61ba6b523ae1ca70 Unionfs: improved comment above
unionfs_follow_link
78d0aaf193e768c7430202f71c38a5622984ff1f Unionfs: Change the semantics of sb
info's rwsem
bdb9ffc822f5e0275ea74777cf333268d609d7d7 Unionfs: Remove superfluous check for
NULL pointer
3e51a7e1461e43fee5aee77ec987fe76c5ac0d72 Unionfs: Change
free_dentry_private_info to take a struct dentry
bd3ca513615a1ec54d48383a97db107e50fc71dc Unionfs: Cleanup
new_dentry_private_data
18e80b3c63ec7caeff957d80d7c4bd9ba748946d Unionfs: prevent deadlock with
branch-management code.
768488d0e16c298f538426e8736a3656890a13ec back-port krealloc from 2.6.22-rc5 to
2.6.21.5
4715b5b8a291f1739a05b71f25fec5f50a7efa7c back-port: struct writeback_control
has no fs_private field
f67560bc8b917f6412900b6a2c19c01c5d826b3c Unionfs: document cache-coherency
design and implementation
e9f407431a49365179a8f0b7aa1658893fac1c35 Unionfs: cache-coherency calls to
maintain the time invariants
9a91c9c7a87554ed96443a1b1f86f8e5194bb154 Unionfs: core cache-coherency code
22c53da6eda3514d854ed5a016a92c070464f5e1 Unionfs: introduce two functions to
maintain time invariants
60093490d0728b6965bb415fbbd750cefb8a3875 Unionfs: prototype and location change
for unionfs_get_nlinks
4a285cc50656ea1fa32a90253fd78d34d221ac40 ecryptfs: update to new API of
fsstack_copy_attr_all
6de061fc618d91d80d31e464bf2d4fc6c2b757c7 fs_stack: simplify generic
attribute-copying function
2f70dab72676a98f7e388c2d6ee4f5a37dbcaed6 Unionfs: m/c/atime invariant checking
debugging code
5bed328de0518bda0edc215d29b33d115156c1fb Unionfs: bugfix in debugging
infrastructure
826f3364f5caacfd173af8d37415389f1ea670a4 Cache coherency: resync unionfs
data/meta-data when lower files change
569d22707b1d7bc5ce1a01e9ff33f89bd646f665 revert changes to
new_dentry_private_data and document it
71a2b5b8d4aaa8ad81c515e0c8ebb180b66be129 cleanup: convert all instances of
"hidden" to "lower".
b4daeb1448e11c838c463cf775671dac60f4bf6b Fix section marker in header file:
74dcae2e85e4fa24368bc221e85f6ec8d028c04c minor indentation correction
5c6c2837596bbae3856792aa52b03adfdae87665 bugfix: properly reset lower inode
start/end range
8b2a7dac52307a888cb7a699e3acf8fadd128141 cleanup: rewrite new_dentry_private
data more simply
5eecdd77c84a5fdc95334b26aa3907f9701c0420 bugfix: remove extra superblock rwsem
unlock call
333d0b2973725bebb9dc0f46268b3c2cdde3251b remove unnecessary comment
ebaf7f7e217ba7477d3ef5b65bb1d297156b5b88 properly format a multi line comment
528f6d43204d20c989ee9b945eff734789757998 reformat all lines longer than 80
characters
daf12b481398d5236d1fbee1d4416e026aa53144 debugging: indent code properly and
cleanups
713cdb8505ea4b794ddd0143dd325736038017cf cleanup: reformat all lines longer
than 80 characters
faab7f68f84808206706bc03da2e650ceb6377b4 spell check all strings and comments
a809f16188e878c91ded0937bd4e919d381e4111 cleanup: ensure proper comment on
every "#endif"
9ad8249841d4477ba25a105a70d99e855211b8d8 Revert "Unionfs: Cleanup locking in
new_dentry_private_data"
c11fa2b7906910aa3185cf2ce243f36cd3f1833f bugfix: ensure dentry/inode/mnt
validity after a successful ioctl
6b32c40dd6a28a608f264cb00c38d092757226aa bugfix: release superblock lock at end
of ioctl method
df8ee4c32f52b1b5c6a94c196bed9d42277c78fc bug fixes: revalidate dentries passed
to all inode/super operations
91b6f7287d54a90caec4d4e3bb7aeeb248916da9 code consistency: ensure that every
#endif has a matching comment
69a92f6581d0ba2f2dc5ee264d421a74d367f9d6 invariants: don't complain if no lower
dentry of a deleted dentry
769a9452046f21d593e180dea4ef78120d709529 invariants: don't complain about
directories with some NULL lower objects
9e2e149f2106ab12bc8e78b8a0228789dedc542b Revert "invariants: don't complain
about directories with some NULL lower objects"
a19963cbd46af6c0cc330453e890244c0427ac27 invariants: don't complain about
directories with some NULL lower objects
912e0f4694e42d05e5560faacc1f26112f2ad475 cleanup: rewrite
unionfs_partial_lookup more cleanly and add comments
4eadb754c2dbe4a0396e72224a8331087b220bcf bug fix: prevent null mntget warning
messages in unionfs_lookup_backend
1cbed8798581b5e03dee5ba39dc2ba33f7fdb609 documentation: expand comments to
unionfs_lookup_backend
a861f045c61381dab684f752b477327e8b6a8e4a cleanup: remove unnecessary call to
inherit_mnt
9700cbc0467eb053e0dea0e2e5c193a6d3fcf345 bug fix: don't warn if trying to
mntput a "negative" union object
a74321497b28cf93b38e34bf6eacf23a91dccafb bug fix: get lower mnt from root
dentry instead of lower dentry
7d95bf5cd698e5efeb42f01aa4c93a168385bd35 Unionfs: allow users to override
Makefile options in fs/unionfs/local.mk
5b144fa5ede4f936119f072283a1cd90a0d420aa documentation: better comment in
branch_id_to_idx
e83d2dd137838b0e79792da30b1a4322a4776e23 bug fix: catch bad use of dirs=
options (extra ':' separators)
d626af247e5ef7d40ac197bbc910bd17613d211b unionfs: merge find_new_branch_index
and branch_id_to_idx into one function
347b5734526a99530db9bf313e8e97000d47e58d unionfs: minor cleanup and better
commenting in new_dentry_private_data
6877020d72f0bdf5577bdf1b4dee272f915f1d65 Unionfs: Cleanup locking in
new_dentry_private_data
e63760754d08f1a47dcb3ccde2020ca6ddd41164 bugfix: prevent null-deref oops if
lower f/s is NFS (mmap writes)
d02fcbdf87254cd5857fa8c649fb5486126776de cleanup: use krealloc instead of
open-coding it with kmalloc/kfree/memcpy
1e1f2eba87592316081a03fdc5bb03c893524f33 bugfix: prevent a NULL ptr deref if
branch is nfs and using mmap writes
4672bd71320ed3f8332d6b427e8303ba3b1b16cb bugfix: handle lower file systems that
do not support writeable mappings
dc864595a236911ab092d1c32545b8af6875a0c0 documentation: comment to ODF
developers to address
d62d74ed720efcc0b6435e826be94b208c918345 bug fix: set lower inodes correctly
after branch management succeeds
458a4c9e3846e8e419a78e52c4a2b61973a6e805 bug fix: prevent self deadlock with
remount code in pivot_root scenarios
f9111e3feeefcfb5fa60a443dae6718c498881b5 debugging: test for freed (0x5a) inodes
a3b30aacc238d08af735c6530428f77b24a67295 bugfix: statfs lower file system
properly
72fd9947be8752418b9d298a6344301b156bd0d9 Add Erez Zadok to maintainers list
f89c7cbfb8e078fa7d234ab8b6dc5fececf0b2a6 add standard copyright comment to
linux/union_fs.h
ee9a1f5182bc5f6aa58f833171e125592d47d292 d_splice bugfix: update dentry in our
lookup if needed.
90b3226a1943632eb433534f3c4f4170e723543a mmap: file revalidation and fanout
invariant validation
cc012aa9d25010e704f560c1e400eff7f566f75d mmap: sync_page bug, call sync_page on
lower page, not unionfs page
18aaa92326a9fe460721347fb318811fe2c9274b mmap: also revalidate file passed to
unionfs_release
fd04478366397038b31dfbd9135f9d1067ee5a27 mmap: update atime upon successful
file reading (via mmap or otherwise)
d7d0598ba5cfe8a629a0d9c72fb6ee85aaa769e9 mmap: proper locking to interoperate
with branch-management code
28cd490271cc0abafeb83f5efe7fa83dd09652dc mmap: remove unnecessary unionfs_bmap
method
32fc7f70f89024a6cbaf07662c307f338a9a5943 mmap: trivial sendfile support
3abdfca932dace9296f1b7ca69fd43afa19f4f5b mmap: minor code and comment
reformatting
c193ab90db7b9057255dd5038643e9b1cdbcc4f7 mmap: #if 0 unneeded code instead of
commenting it out
a6a4182ea13df72d3d1313bd76f5cf3a06fcdfd4 mmap: read upper file instead of lower
file
31efd44eff7bb049f6adc946dc7dd0411b582c84 mmap: coding style: reformated a line
longer than 80 chars
884a188fb5984198a9782f62ab250b2d9247adb1 mmap: remove defunct comments
36220d2fdb980f50d6cdc04fce9aac8e0598df2d mmap: file revalidation
7f6c5ec017ff0d3fabd5cd3b62935f513dbddcd6 mmap: applied main mmap patch
c22bf4b09cddafb78e02a4a3defb6b25fa0e9fb5 bugfix: fixed interpose to check if
d_splice_alias returns a dentry
11c1d1d170030f529b6d2f739e06251ddf9128a7 debug: remove unnecessarily verbose
debugging printk's
5cc153c861b5f716fcaee030f9f665639df2451a cleanup: consistent printk messages
4c6bd9de4acdc5738ddec54f4b7123df4fc48758 cleanup: eliminate wrapper function
create_parents
453d69213b3274c2ab9d98c41be3bf845ffb7cca cleanup: eliminate wrapper function
copyup_dentry
75705bb293e380069e8276650097a1ebd8f7f1cb cleanup: rewrite do_delayed_copyup
more cleanly and clearly
9f36353b9eb0bf8f0a95f71dc5f0598ef37383ac debugging: small fix to Makefile to
correct #define typo
531abbe2635fc8fca08ba4319a5edc51ac2fb471 cleanup: remove unnecessary macro used
in only one place
46dc59d0fff3190f96209c06cfd0907be21a542f bug fix: don't revalidate dropped
dentries
42d41a7d120a2a2611ed31c5553b79a92315909d bug fix: retry lookup for different
silly-renamed files
e15794920b9c9e2317ee41dcb4e47417665c13bf Documentation: better comments for
copyup-related code
e1bd1dfc8541404975b7f97ecdba70ee9422ecd2 Verify and maintain fanout invariants.
571dd72c4a4f8bb4cd9faaae230c1a96b0b81857 Post-copyup helper functions
9204808b4f4e63ba22c5fa7546cdba50abd5bb45 Introduce compile-time debugging
support to Unionfs
70d1b30010da484aa97f4d951640d721e43d46ca bugfixes: correctly decrement
refcounts of mnt's upon branch management
6fb34532c9a556cf1a884ec242d1285a8662fb30 bugfix in BUG_ON use: actually catch
bad use of unionfs_mntput
84f0a24229cccc8f6983c4ea59833232dfa703ef cleanup: removed a trailing whitespace
1b20137eb5d99ac858f3e154e60b1985c979d710 bugfix: remove defunct
unionfs_put_inode method
5e29f32eb91f353f2a0a0fae3d7137e25f25cbc7 optimize branch overlapping test a bit
f7ee66b69b96153234778367493db75c74a6d68e Documentation update regarding
overlapping branches and new lookup code.
ca7a41797860a09d81522b446d9a59a17a834e00 branch management: disallow setting
leftmost branch to readonly
c1c821b5d35dff95d4f53c663255e289beb36f76 fsstack: 4th case to do_path_lookup
62c00e990809d7afedd4c0ae8adbc4add4b5b517 Revert "Unionfs: Check remount options
for being NULL"
5bccd9c658f74b9ef93743c899c41de3db7cc195 bugfix: don't leak resources when
copyup fails partially
be4619f6bd0e68fa50912753086b7b6014c6e536 cleanup: call our
unionfs_{unlock,lock}_dentry instead of mutex ops.
5a09b87c927184fef863379e49bce27c2d1a0e24 cleanup: rename our "do_rename" to
__unionfs_rename.
f102550f777ee0fdce771aab0b570b591946435b cleanup: rename prefix our version of
double_lock_dentry with "unionfs_"
81c9ef27495bec191acebd82287cfa4f0ec22b9d Cleanup: ensure space between every
comma-delimited function argument list
70abc76ab5ca0829632a146426bae0f2e4a563bd cleanup: rewrite long while(1) loop
more cleanly
f02b652eb7fa89be3f27a122e48f2e9207f5c2d0 Move one function off of branchman.c
and remove source file.
5e70f5f15013dc6af3c8fb6e11b2339f0e6df41c cleanup: consistent pointer
declaration spacing.
c4405a5a1f1c487883029f63066a68e4002fc6ef Merge unionfs_write with
__unionfs_write.
9e2a8338308b502df3448ede7f850774b1dece10 cleanup: fix one odd indentation and
long line breakup.
5271c4598ec8d209edc12bba7697ef92219e6913 Commenting the code.
9bbe31521ec7bb5754bf1035081b07d6f1627417 cleanup: prefix external functions
with 'extern' properly
606a2942df3d932c2b71e2344ea1e15d591adf61 cleanup: one more trailing whitespace
removed.
05e2d124e3e480428640b28ee9fb77826041bf68 cleanup: spell check all strings and
comments
99fe16364c97550c3d437f38fb26c51b7cafb331 cleanup: use consistent style for
multi-line comments
140dd6b8960a4848533c36689ebe2fae58e8485d cleanup: keep all top-of-function
automatic variables clustered together
f420ceb2726579701fcd2d9814048c6306a3bb72 coding-style: remove one more {braces}
around one-statement code block
aa779dfd4531813ed3b02eee10de73f5e017e4ce cleanup: remove unnecessary blank
lines in short code blocks
8d20f61bcb26a90e8604b6c9bea59a0ada67fbc9 cleanup: add missing copyright notices
f9812aa0862fb6a0d59d5a5a5bf8b7cbd2b40aaa coding-style: reformat lines longer
than 80 chars (accounting for TABs)
8385d122442a338df586f3f9c3d3f432da61a1a1 cleanup: every printk should prefix
with "unionfs: " consistently
35dd2c5cb0c4c1e9c78f8e791853203c26dae256 coding-style: remove unnecessary
{braces} around one-line code blocks
1a7741352cc23cbc290e388fd32b13b705c7ca95 coding-style: no lines over 80 chars
0ff83c14058cbdd759259a0b5c56b3348f6c76a8 coding-style: indent every line
properly
3b6d8332811b103b7c02d3410b4d2fdde4faf5d0 cleanup: remove trailing spaces
5d4d6341591d4c233ba28c24c74859473d15de9f Documentation: fix spelling error
975f72741a1f6636ea9c9945a268aeffa49148b7 Documentation: minor typo fixed in
incgen remount option
016e6b13d9ab146bad11858b2cc3c3cd1a5e0f4b Unionfs: SLAB_CTOR_CONSTRUCTOR has
been removed from vanilla
206dc5c061999b8a3810d2ec8fa60953963ab679 [PATCH] unionfs: fix slab abuses with
krealloc
25da85ffe388d74e3becd65be3ab5eff6b01d0b8 [PATCH] fix unionfs compilation
43b83b3bf78da0f1008e7308b4c03e17b5665ffe Unionfs: Check remount options for
being NULL
4cfdea2e749480ec59dfe9d1673235711cc8aa6e Unionfs: Accept MS_SILENT during
remount
6d8c3fa8a2a54d922b933c8bd814c3da538dbafb Unionfs: Don't inline
do_remount_{add,del,mode}_option
c4add0886c9a0a33ec5a3f6276cffd2a614a331b Unionfs: Added several BUG_ONs to
assert dentry validity
b673c9b2579a31c006cb6f8e4ad84f7fb05841a0 Unionfs: Properly handle stale inodes
passed to unionfs_permission
d25b7543df288251488f3698dcb7df953eaa899a Unionfs: Pass lowernd to lower
->revalidate function
26d72ac1369570d81b0b746d72acbc532e27a0bb Unionfs: vfsmount reference counting
fixes
1d08521d01328b893cbf277312c4c6143f1dc4ad Unionfs: unionfs_create needs to
revalidate the dentry
c3318fe7edddaffa4df96c08a04af208ebf300a7 Unionfs: Decrement totalopens counter
on error in unionfs_open
d6494fa018680fe6f2314f98590b2402a433bf85 Unionfs: Document unionfs_d_release
locking
c3383722154ecea2a547a3a87eed0bc72ca41676 Unionfs: Remove the older incgen ioctl
4403e602135110282a9e6680064602286f365564 Unionfs: Grab the unionfs sb private
data lock around branch info users
bdb4b197d4854208d1686799cd0a678269e5df70 Unionfs: Rewrite unionfs_d_revalidate
177a660a7e7ab468f84a06778427bd2f685594b9 Unionfs: Introduce unionfs_mnt{get,put}
2d84ca385a8ec58030a5f312c18f6942916f8827 Unionfs: Bulk of branch-management
remount code
32a162a2b1619171af278f5b5a20758d36830b63 Unionfs: Introduce branch-id code
6544ed21a643311bfc3730a275af726c0ea15974 Unionfs: Actually verify if dentry's
info node is locked
bad48011bc8c267a7c49ba93d04276120e725542 Unionfs: Provide more helpful info on
branch leaks during unmount
5d99fcd59bdb808f8d2399dfdcfc914a91d92433 Unionfs: Rename unionfs_data sbcount
field to more appropriate open_files
63acef47717cf4bb8e2a1353733afab6bffbddb3 Unionfs: Proper comment on rwsem field
b870c5076d605717994a45d595cb6a01d5800515 Unionfs: Documentation updates for
branch-management
85e8c492f952c067f8830077d5d4aa19534e032b fs: Export drop_pagecache_sb symbol
17a583be90705fd4f1701b97d2f38f876b0b14f6 fs: Introduce path{get,put}
4a529b415a95f515d346bd60d579ecefd82d145d [PATCH] Unionfs: sioq not __exit
916a0c37ac2d70a13d9493288e14093f759d5fb0 MAINTAINERS: Unionfs URL update
3eae745f9b45c4fb59c3daf6e0e8e3d9fdcdb97b fs/unionfs/: Fix unlocking in error
paths
1d683a809e66d6e35629338ddf22948efc97270a fs/unionfs/: Fix dentry leak in
copyup_named_dentry
cd505d0572a8fb1868d28d10409bcfcac1ddbc61 fs/unionfs/: mntput in __cleanup_dentry
8fbbcf514a4034044909ad969bbee3613d9ef2c6 fs/unionfs/: Fix copyup_deleted_file
dentry leak
d3ff19839f4a784a08dcfc045078a35af579d475 fs/unionfs/: Miscellaneous coding
style fixes
5eb361d832a12a8b56116aa57c5c4d60dc289885 fs/unionfs/: Check return value of
d_path
fd2b6ac845110295446633862d0c53a20a620617 fs/unionfs/: Use SEEK_{SET,CUR}
instead of hardcoded values
97947674255a237f8ace226031e98b7ea526a73b fs/unionfs/: Remove alloc_filldir_node
9b3cb57b220e16517e5da34e29213b6da82bb218 fs/unionfs/: Rename
unionfs_d_revalidate_wrap
05668ea4a26798367384da2535c3744385a4fe96 fs/unionfs/: Several small cleanups in
unionfs_interpose
93c758308fc05fe8c6088face7ca1864d08cf309 fs/unionfs/: Don't grab dentry private
data mutex in unionfs_d_release
34a109abe1106dc98b9eb005f2dfe716a0237946 fs/unionfs/: Fix a memory leak in
unionfs_read_super
974e6c4d83c6d1227a93560c8e3a77949b8240de fs/unionfs: Fix a memory leak & null
pointer dereference
e0f62b1f2a76f8b6f79dda2a62d3dc535b2c1481 [PATCH] UNION_FS must depend on SLAB
3c55b19a07deeeeb718cd54681f8e8e403609b5a fs/unionfs/: Remove unused structure
members & macros
1eb6fed12de4b246468349b5be918401b15d51ee eCryptfs: convert lookup_one_len() to
lookup_one_len_nd()
07c52cf387dd4055849170c7349bb3c8748db098 Unionfs: Documentation update
2459a4baba5b692dca0cf470b744bfd8e3512e96 fs/: Move eCryptfs & Unionfs config
options into a sub-menu
841f1766a3b107e8ddb5b9133068af87b5464035 fs/unionfs/: Use __roundup_pow_of_two
instead of custom rounding code
a07c6a2ebdf3e46855b6333132f3bc3dbfbd9275 fs/unionfs/: Don't duplicate the
struct nameidata
c8c23cef1bf3ecdd5f2781993e05f4f52b92a745 fs/unionfs/: Andrew Morton's comments
28f7792f31420034fff97cce59ae80281b02bfff fs/unionfs/: possible cleanups
d7f988588437d6a8a3ae45bb0481058d6e09ce83 fs/unionfs/: Remove stale_inode.c
ffa82e3b14cd5416f9d45e130610cc3c0da11910 Unionfs: Extended Attributes support
86ba46b65670244b2afd10bd1ab959575ad1591d Unionfs: Kconfig and Makefile
0908bc412bb3cfbf79e16f60b5ce8b7084219930 Unionfs: Unlink
b17bc1cf9d5d5802b84646fd3eddf87130297ce4 Unionfs: Include file
7f1c0d473947a397b464db2bc1d831cfc76fb4f9 Unionfs: Internal include file
959c5c233c0c95329385bb9ff4a7a5dcda605fcd Unionfs: Helper macros/inlines
484f0e68f5ac76d86ee03d5408fd7f8f59f3679c Unionfs: Handling of stale inodes
cbdedb5eab457e65e8d8db1b22c7248129ebd5c0 Unionfs: Superblock operations
5fa848b326315aa6f6e9ef31ee9efb8374372c99 Unionfs: Miscellaneous helper functions
d1fc5304985ef15e30b4fe733ebf6a6595b08fc1 Unionfs: Privileged operations
workqueue
0a4ba342a2c42ab3ddc1c98fb17083fad4b93e71 Unionfs: Rename
7542a84c1c26115f9b5c4be9134a03e10dadfeaa Unionfs: Readdir state
ee972de8b9f6706ccbe4e5ef908a723bf5de5a87 Unionfs: Main module functions
ddf2832caf5cfbfd8b5ffd08cc53865bcf2eee58 Unionfs: Lookup helper functions
579a8d06e0bea699de42541c8e6138de32105a53 Unionfs: Inode operations
4af092a4096f06e36c51bfe3812636a85800d6de Unionfs: Directory manipulation helper
functions
489a22a64a44bca8106c9d08d54f0a7dca46fb47 Unionfs: Directory file operations
f8e1ad2d82647ad0ca062cc84ab1e3d48dbbfe3d Unionfs: File operations
fed23dedca5a34dfd786ff537d609751f7b73fcc Unionfs: Dentry operations
b7ccec0e46df2c57062a372ae56d2281b2faa59e Unionfs: Copyup Functionality
8490505a8255c0d23e01d51470ccc1aa12b6f31d Unionfs: Common file operations
2cfdc83ad90f84c91c3547d438b1d6e35e909c82 Unionfs: Branch management
functionality
d8b57bdebf8c555ecb1f06816f7625e858f37d09 Unionfs: Documentation
62bc1a8994d1fe68afa2aee42aa3c8269d3f0414 lookup_one_len_nd - lookup_one_len
with nameidata argument
eb5f1c29b4ba4533ccd13eed24b5a89257286225 Linux 2.6.21.6
fcc56368e2c29ef4fb91d9374cea4834d0a6eb61 nf_conntrack_h323: add checking of
out-of-range on choices' index values
_______________________________________________
unionfs-cvs mailing list: http://unionfs.filesystems.org/
[email protected]
http://www.fsl.cs.sunysb.edu/mailman/listinfo/unionfs-cvs
