Whamcloud - gitweb
brian [Tue, 17 Jan 2006 22:21:39 +0000 (22:21 +0000)]
Make kernel configs look like make oldconfig will make.
brian [Tue, 17 Jan 2006 22:15:15 +0000 (22:15 +0000)]
Use sendmail and set the sender address to ensure that mail is not sent from a
domain name that is neither an A or MX record (and thusly gets refused by
mail servers).
adilger [Tue, 17 Jan 2006 19:08:22 +0000 (19:08 +0000)]
Branch b_release_1_4_6
Use the "fid" EA name when storing FID data on the OST. This avoids
confusion on the OST when using the "lov" EA name and would certainly
be a problem with lfsck.
b=10072
r=yury
adilger [Tue, 17 Jan 2006 10:41:35 +0000 (10:41 +0000)]
Branch b_release_1_4_6
Quiet compile warning.
adilger [Sat, 14 Jan 2006 01:08:14 +0000 (01:08 +0000)]
Branch b_release_1_4_6
Merge changes from b1_4 that were missed in recent b_release_1_4_6 (b2) update
SWIOTLB = run x86_64 kernel on nocona
EXT3_MOUNT = avoid flag conflict with newer 2.6.12 kernel, make patches closer
adilger [Fri, 13 Jan 2006 21:34:18 +0000 (21:34 +0000)]
Branch b_release_1_4_6
Ignore generated file.
phil [Fri, 13 Jan 2006 17:24:44 +0000 (17:24 +0000)]
5047 looks like a major, if not critical, data corruption bug. Updating the
changelog accordingly.
adilger [Thu, 12 Jan 2006 07:50:21 +0000 (07:50 +0000)]
Branch b_release_1_4_6
Dbench failing to run properly because the clients.txt file is truncated.
rundbench verifies that the file has a non-zero size instead of just existing.
r=brian
houfeng [Thu, 12 Jan 2006 04:53:32 +0000 (04:53 +0000)]
remove needless lwizard; that break rpm building
cliffw [Thu, 12 Jan 2006 00:19:25 +0000 (00:19 +0000)]
Remove lwizard and associated documents
adilger [Wed, 11 Jan 2006 09:59:57 +0000 (09:59 +0000)]
Merge b_release_1_4_6 from b1_4 (20060110_0557)
Description: OST becomes very slow and/or deadlocked during object unlink
Details : filter_destroy() was holding onto the parent directory lock
while truncating+unlinking objects. For very large objects this
may block other threads for a long time and slow overall OST
responsiveness. It may also be possible to get a lock ordering
deadlock in this case, or run out of journal credits because of
the combined truncate+unlink. Solution is to do object truncate
first in one transaction without parent lock, and then do the
final unlink in a new transaction with the parent lock. This
reduces the lock hold time dramatically.
b=4180, b=6984, b=7171, b=9963, b=9331
r=alex
Description: MDS or OST cleanup may trip kernel BUG when dropping kernel lock
Details : mds_cleanup() and filter_cleanup() need to drop the kernel lock
before unmounting their filesystem in order to avoid deadlock.
The kernel_locked() function in 2.4 kernels only checks whether
the kernel lock is held, not whether it is this process that is
holding it as 2.6 kernels do.
b=9967
r=nathan
Description: unlinked inodes were kept in memory on the client
Details : If a client is repeatedly creating and unlinking files it
can accumulate a lot of stale inodes in the inode slab cache.
If there is no other client load running this can cause the
client node to run out of memory. Instead flush old inodes
from client cache that have the same inode number as a new inode.
b=1443
r=niu (original patch)
Description: Referencing freed requests leading to crash, memleask with NFS.
Details : We used to require that call to ll_revalidate_it was always
followed by ll_lookup_it. Also with revalidate_special() it is
possible to call ll_revalidate_it() twice for the same dentry
even if first occurence returned success. This fix changes semantic
between DISP_ENQ_COMPLETE disposition flag to mean there is extra
reference on a request referred from the intent.
ll_intent_release() then releases such a request.
b=9942, b=9903
r=green (original patch)
cliffw [Tue, 10 Jan 2006 23:53:18 +0000 (23:53 +0000)]
Added the <url> for the Knowledge Base article
alex [Tue, 10 Jan 2006 20:21:52 +0000 (20:21 +0000)]
b=9969
- skip invalidated dentries via ll_dcompare()
- one more patch to the suse series to embed d_name structure into dentry unconditionally
adilger [Tue, 10 Jan 2006 17:58:52 +0000 (17:58 +0000)]
Merge b_release_1_4_6 from b1_4 (20060110_0557)
- fix lustre/tests build problem before doing full merge
adilger [Tue, 10 Jan 2006 12:48:27 +0000 (12:48 +0000)]
Update b_release_1_4_6 from b_hd_newconfig
- add timestamps for liblustre debug messages
- use wait_event_interruptible_exclusive() to LNDs so we don't get
too-many-thread wakeups and lock contention when waiting for events
- fix tx credits handling
- fix incorrect error for multiple networks and portals_compatible option
- add 2.4 compatibility macro for wait_event_interruptible_exclusive()
brian [Mon, 9 Jan 2006 19:14:25 +0000 (19:14 +0000)]
Update the ChangeLog and version info for 1.4.6 beta2.
wangdi [Sat, 7 Jan 2006 05:18:22 +0000 (05:18 +0000)]
Branch: b_release_1_4_6
b=9926
1) shrink the reply buffer for unlink and orphan close
2) retrieve max mdsize and cookiesize in getattr, because in join, max_mdsize and
cookiesize might change, and all the clients should know this info.
r=adilger
alex [Fri, 6 Jan 2006 23:57:11 +0000 (23:57 +0000)]
b=5681
r=nikita
- don't unhash in-use dentries because it breaks sys_getcwd()
green [Fri, 6 Jan 2006 06:21:27 +0000 (06:21 +0000)]
b=9942,9903
r=adilger
Treat DISP_ENQ_COMPLETE as a flag that request referenced from this intent
has extra reference that needs to be released, if still set at intent freeing
time.
green [Fri, 6 Jan 2006 06:05:29 +0000 (06:05 +0000)]
b=9942
r=adilger
In link_raw() always call iget before doing d_instantiate
green [Fri, 6 Jan 2006 05:49:12 +0000 (05:49 +0000)]
b=10027
r=adilger
Do not segfault in 'lfs check' if no Lustre fs mounted.
adilger [Thu, 5 Jan 2006 22:37:06 +0000 (22:37 +0000)]
Branch b_release_1_4_6
Don't call _sysio_shutdown() on catamount, Lustre isn't the only user of
libsysio there.
b=10024, b=7193
green [Thu, 5 Jan 2006 21:45:29 +0000 (21:45 +0000)]
b=9780
Check that we actually encountered a symlink before returning error.
green [Thu, 5 Jan 2006 21:12:19 +0000 (21:12 +0000)]
b=9781
r=adilger
When we cancel a lock in completion or blocking callback 0 we must return
-ERESTART so that resource would be reprocessed again.
green [Thu, 5 Jan 2006 21:08:55 +0000 (21:08 +0000)]
b=7313
r=adilger
Latest version of reply-less lock callbacks patch with proper replay
support - for testing by Cray.
alex [Thu, 5 Jan 2006 19:46:14 +0000 (19:46 +0000)]
b=9678
r=adilger
- free pool after client_obd_cleanup() because the latter may abort in-flight requests from the pool
adilger [Thu, 5 Jan 2006 09:58:33 +0000 (09:58 +0000)]
Branch b_release_1_4_6
Don't update thread->t_id as we exit from ptlrpc_main() after waking
t_ctl_waitq, as it is possible the thread struct is being freed by
ptlrpc_stop_thread() that was waiting on t_ctl_waitq.
r=alex
green [Wed, 4 Jan 2006 22:21:51 +0000 (22:21 +0000)]
Branch: b_release_1_4_6
b=9780
Better version proposed by Lee.
nic [Wed, 4 Jan 2006 21:06:17 +0000 (21:06 +0000)]
update the fc3 kernel to be more like the newer rhel4 kernel to allow the rhel4
patches to apply
adilger [Tue, 3 Jan 2006 22:50:45 +0000 (22:50 +0000)]
Branch b_release_1_4_6
Ensure that statfs does not come out of local cached value.
b=9691
green [Tue, 3 Jan 2006 22:48:44 +0000 (22:48 +0000)]
b=9780
properly handle O_NOFOLLOW
green [Tue, 3 Jan 2006 22:46:30 +0000 (22:46 +0000)]
More sync-up with sysio head
alex [Tue, 3 Jan 2006 19:10:41 +0000 (19:10 +0000)]
b=9919
r=nikita (original fix)
hijacks pages from struct brw_page (allocated by echo_client_kbrw()) by filter_brw(). This
- fixes problem introduced by 5137 (filter_preprw_*() assumes that pages are preallocated),
- avoids duplicate allocation,
- avoids data copying.
Also fixes small defect in filter_iobuf_get().
adilger [Mon, 2 Jan 2006 08:04:54 +0000 (08:04 +0000)]
Branch b_release_1_4_6
Define $tdir and $tfile for sanityN.sh, bringing us one tiny step closer to
being able to use test-framework.sh for sanityN.sh.
adilger [Mon, 2 Jan 2006 07:48:32 +0000 (07:48 +0000)]
Branch b_release_1_4_6
Description: two objects could be created on the same OST for a single file
Details : If an OST is down, in some cases it was possible to create two
objects on a single OST for a single file. No problems other
than potential performance impact and spurious error messages.
b=9923
r=green
adilger [Mon, 2 Jan 2006 07:38:42 +0000 (07:38 +0000)]
Branch b_release_1_4_6
We should always be starting service threads when we call
ptlrpc_start_threads(). This caused a very tricky to notice "communications"
problem when an OST didn't start any service threads. This can only be a
code problem, and not from module parameter input.
r=hwartens
phil [Sat, 31 Dec 2005 16:33:00 +0000 (16:33 +0000)]
a local-tree-cleanup commit full of empty calories
green [Sat, 31 Dec 2005 13:44:12 +0000 (13:44 +0000)]
b=10018
Fix 64 bit compile problem
niu [Sat, 31 Dec 2005 05:03:09 +0000 (05:03 +0000)]
acquire block quota on owner of child also, in case of ea block counted in some kernel version.
b: 10017
yury [Fri, 30 Dec 2005 07:58:39 +0000 (07:58 +0000)]
b=9926
r=adilger
- do not confuse developer looking at logs by saying that namespace is freeing on last lock put.
- cleanups in mds_init_lov_desc()
- using stripes = min(tgt_count, LOV_MAX_STRIPE_COUNT) as a basis for calculating easize/cookiesize on MDS and client.
- removed redundant obd_set_info("mds_conn") in mds_notify()
green [Thu, 29 Dec 2005 22:00:01 +0000 (22:00 +0000)]
Change some CERROR()s that are not errors to CWARN()s in administrative
evictions path.
green [Thu, 29 Dec 2005 21:57:30 +0000 (21:57 +0000)]
Switch b_release_1_4_6 to use new libsysio.
green [Thu, 29 Dec 2005 21:50:49 +0000 (21:50 +0000)]
Branch: b_release_1_4_6
new libsysio from Sandia.
niu [Thu, 29 Dec 2005 06:32:12 +0000 (06:32 +0000)]
- typo fix
- message format fix for 'lfs quota -t'
adilger [Sat, 24 Dec 2005 20:07:28 +0000 (20:07 +0000)]
Branch b_release_1_4_6
Fix up acl check.
adilger [Fri, 23 Dec 2005 23:59:09 +0000 (23:59 +0000)]
Branch b_release_1_4_6
Use (effectively) ptlrpc_daemonize() when starting the ping evictor thread,
as this thread can do filesystem IO when evicting clients (update last_rcvd)
and as a result trip LASSERT in pop_ctxt().
We can't call ptlrpc_daemonize() directly from code in obdclass as that
results in module symbol circular dependencies. Looking into moving the
pinger code into ptlrpc entirely to avoid this issue.
b=9961
r=nathan
adilger [Fri, 23 Dec 2005 06:07:10 +0000 (06:07 +0000)]
Branch b_release_1_4_6
Fix error message argument order
b=9788
r=nathan (original fix)
niu [Fri, 23 Dec 2005 03:51:45 +0000 (03:51 +0000)]
make lustre_get_qids() support 2.6.12
b: 9812
brian [Thu, 22 Dec 2005 20:05:26 +0000 (20:05 +0000)]
b=9975
r=adilger
Add a --disable-quilt option to force ldiskfs patching using patch rather than
quilt even if it's found.
brian [Thu, 22 Dec 2005 19:30:46 +0000 (19:30 +0000)]
Revert this commit. The obdfilter module produces the following error on load:
/lib/modules/2.4.21-37.EL_lustre-b_release_1_4_6.200512222341smp/kernel/fs/lustre/obdfilter.o: unresolved symbol IS_KEY
yury [Thu, 22 Dec 2005 10:59:33 +0000 (10:59 +0000)]
- fixed debug message in ldlm_lock_put() to less confusing. Former looked
like this:
"final lock_put on destroyed lock, freeing namespace ..."
whereas it should like this:
"final lock_put on destroyed lock, freeing it. namespace ..."
- cleanups in mds_init_lov_desc()
- in mds_notify() remove obd_set_info("mds_conn") before calling mds_lov_start_synchronize()
as it will be called by mds_lov_start_synchronize() itself.
- in filter_set_info() using IS_KEY() macro
green [Wed, 21 Dec 2005 17:15:50 +0000 (17:15 +0000)]
Branch: b_release_1_4_6
r=adilger
Make llu_dir_do_readpage to match LCK_CR locks to conform to inodebits new
locking policy.
alex [Tue, 20 Dec 2005 21:51:34 +0000 (21:51 +0000)]
r=green
- remove dentry from hash before puting on orphan list (2.4 only)
adilger [Tue, 20 Dec 2005 09:27:56 +0000 (09:27 +0000)]
Branch b_release_1_4_6
Add /proc/fs/lustre/{mdc,osc}/*/connect_flags entries, so it is possible
to check what features are supported by a client.
adilger [Tue, 20 Dec 2005 07:13:38 +0000 (07:13 +0000)]
Branch b_release_1_4_6
Fix minor compile warnings.
yury [Mon, 19 Dec 2005 15:47:15 +0000 (15:47 +0000)]
- mostly debug stuff for #9926
- easize + lov_desc initialization is moved to mds_lov_update_desc()
niu [Mon, 19 Dec 2005 07:02:29 +0000 (07:02 +0000)]
read all old quota limits on quotacheck.
b: 9812
yury [Sat, 17 Dec 2005 17:06:57 +0000 (17:06 +0000)]
- lov_add_obd() should pass OBD_NOTIGY_ACTIVE instead of 1 as 1 means OBD_NOTIGY_INACTIVE, also not good to use magical digits.
This seems result of wrong backport from HEAD, as in HEAD obd_notify() has boolean flag (active/inactive) instead of event type.
This bug caused mds_notify() did nothing in the case of addind one more OST.
- fixed ENTRY/RETURN in lov_notify()
adilger [Sat, 17 Dec 2005 06:32:29 +0000 (06:32 +0000)]
Branch b_release_1_4_6
Print out filesystem label and UUID at server mount time for diagnosis.
b=9937
r=nathan
alex [Sat, 17 Dec 2005 00:39:42 +0000 (00:39 +0000)]
b=7225
- mballoc3 is landed
nic [Fri, 16 Dec 2005 21:14:09 +0000 (21:14 +0000)]
b=9933
r=adilger
call tcpnal_set_global_params() to parse things like TCPNAL_PORT
yury [Fri, 16 Dec 2005 15:07:40 +0000 (15:07 +0000)]
- fixed few EXIT/RETURN
- added more debug for cacthing diff >= 0 assert
nic [Fri, 16 Dec 2005 00:48:33 +0000 (00:48 +0000)]
r=brian
enable pthreads outside of liblustre so that lctl --threads works on a non
liblustre build
yury [Thu, 15 Dec 2005 15:01:45 +0000 (15:01 +0000)]
- in mds_lov_start_synchronize() if mds_lov_synchronize() thread did not start due to some reason, do not do
class_export_put(), that causes assert in case export has only one ref as export is still hashed. In fact, there
should be decref for previously made incref to @obd->obd_refcount and this fucntion seems not supposed to do
something else.
cliffw [Thu, 15 Dec 2005 01:00:42 +0000 (01:00 +0000)]
Changes for 1.4.6 so modprobe.conf is updated correctly and ptlrpc is
commented out. From Andreas
r=cliffw
nic [Wed, 14 Dec 2005 20:24:42 +0000 (20:24 +0000)]
r=adilger
seed the fsx operations from the time so that we vary the test sequence a bit
nic [Wed, 14 Dec 2005 16:19:33 +0000 (16:19 +0000)]
b=7238
we don't need to tell llmount about -o port=XXXX, lnet does that with module
options now
adilger [Wed, 14 Dec 2005 11:55:47 +0000 (11:55 +0000)]
Branch b_release_1_4_6
Description: failure of ptlrpc thread startup can cause oops
Details : Starting a ptlrpc service thread can fail if there are a large
number of threads or the server memory is very fragmented.
Handle this without oopsing.
b=9493
Tested extensively at Bull (512 OST service threads).
adilger [Wed, 14 Dec 2005 11:41:22 +0000 (11:41 +0000)]
Branch b_release_1_4_6
Fix error exit code of test 21 umount handler.
b=9931
adilger [Wed, 14 Dec 2005 09:35:44 +0000 (09:35 +0000)]
Branch b_release_1_4_6
Actually fix this problem
b=9692
yury [Wed, 14 Dec 2005 08:34:57 +0000 (08:34 +0000)]
- fixed possible skipped lquota_adjust() in filter_setattr_internal() due to fsfilt_setattr() turns off
all flags it set which also used to check if we need to adjust quota or not.
adilger [Wed, 14 Dec 2005 01:02:23 +0000 (01:02 +0000)]
Branch b_release_1_4_6
Allow test to run with existing dir.
b=9692
green [Tue, 13 Dec 2005 22:36:10 +0000 (22:36 +0000)]
r=adilger
Move lprocfs_register return value check under LPROCFS ifdef. IS_ERR threats
NULL as error too.
adilger [Tue, 13 Dec 2005 21:22:34 +0000 (21:22 +0000)]
Branch b_release_1_4_6
oops
adilger [Tue, 13 Dec 2005 21:17:15 +0000 (21:17 +0000)]
Branch b_release_1_4_6
Ignore genrated fle.
adilger [Tue, 13 Dec 2005 21:14:47 +0000 (21:14 +0000)]
Branch b_release_1_4_6
Verify that clients only enqueue LDLM_IBITS locks to MDS now. If server
does not handle OBD_CONNECT_IBITS then client DLM will convert this to
LDLM_PLAIN when sending RPC.
Handle IBITS locks in ldlm_lock_match() debug messages.
Verify lock type and do type conversion before performing lock replay.
b=9912
r=green
adilger [Tue, 13 Dec 2005 10:32:32 +0000 (10:32 +0000)]
Branch b_release_1_4_6
Fix merge breakage of join feature when IBITS locking was added.
b=9912
r=green
Move JOIN_FILE definitions away from potentially-conflicting VFS flags.
Minor cleanups in Join file code (line wrap, whitespace).
yury [Tue, 13 Dec 2005 09:05:02 +0000 (09:05 +0000)]
- small simplification in filter_setattr_internal()
yury [Tue, 13 Dec 2005 08:57:40 +0000 (08:57 +0000)]
- fixed type in comment
yury [Tue, 13 Dec 2005 08:35:18 +0000 (08:35 +0000)]
- former precreate pools stuff is returned back
- some additions to make quota work with formet creareate code
- some small fixes to filter_setattr() path
alex [Tue, 13 Dec 2005 00:14:57 +0000 (00:14 +0000)]
b=9562
r=adilger,nikita
- fixes in dcache interaction code. we need to lock dentries in 2.6.
also, we use __d_drop() instead of list_del() because the former
takes a care about actual dentry state (hashed/unhashed)
alex [Mon, 12 Dec 2005 23:28:33 +0000 (23:28 +0000)]
- disable mballoc "too long search" warning for a while
adilger [Mon, 12 Dec 2005 21:49:52 +0000 (21:49 +0000)]
Branch b_release_1_4_6
Found during CROW revert inspection/testing though not directly related to
that bug. ll_direct_io_24() calls ll_inode_fill_obdo() with VFS "rw" flag
(0=read, 1=write) and not OBD_BRW_READ=1, OBD_BRW_WRITE=2 flag.
b=9761
adilger [Mon, 12 Dec 2005 09:16:32 +0000 (09:16 +0000)]
Branch b_release_1_4_6
Severity : enhancement
Bugzilla : 9477, 9557, 9870
Description: Verify that the MDS configuration logs are updated when xml is
Details : Check if the .xml configuration logs are newer than the config
logs stored on the MDS and report an error if this is the case.
Request --write-conf, or allow starting with --old_conf.
r=adilger,nathan (lincent original patch, modified by adilger)
Severity : enhancement
Bugzilla : 6034
Description: Handle symlinks in the path when checking if Lustre is mounted.
Details : Resolve intermediate symlinks when checking if a client has
mounted a filesystem to avoid duplicate client mounts.
r=phil,adilger (Fergal original patch)
Severity : minor
Frequency : rare
Bugzilla : 9309
Description: lconf can hit an error exception but still return success.
Details : The lconf command catches the Command error exception at the top
level script context and will exit with the associated exit
status, but doesn't ensure that this exit status is non-zero.
r=phil,adilger (Fergal original patch)
Add "accept=all" when running from a developer tree to allow liblustre
testing, as insmod does not look at /etc/modules.conf for module options.
r=green
green [Sun, 11 Dec 2005 22:13:17 +0000 (22:13 +0000)]
b=9907
Fix __l_wait_event to correctly honor timeout value (broken by bug 9297 changes).
green [Sat, 10 Dec 2005 10:19:26 +0000 (10:19 +0000)]
b=9794
r=adilger
This patch uses a fast, high-quality PRNG internal to Lustre instead of the
glibc PRNG to avoid perturbing the glibc PRNG sequence for liblustre clients.
It also uses this PRNG for some uses in the lustre core code.
Introduces ll_rand() and ll_srand() with usage similar to rand(3) and srand(3)
brian [Fri, 9 Dec 2005 19:19:24 +0000 (19:19 +0000)]
b=9729
r=adilger
Merge the --enable-bgl changes from b1_4.
nic [Fri, 9 Dec 2005 18:36:13 +0000 (18:36 +0000)]
b=7283
r=adilger
allow tests to handle non-default ACCEPTOR_PORT
adilger [Fri, 9 Dec 2005 10:32:34 +0000 (10:32 +0000)]
Branch b_release_1_4_6
Minor compile warning fix.
adilger [Fri, 9 Dec 2005 10:26:31 +0000 (10:26 +0000)]
Branch b_release_1_4_6
Increase the default lustre DLM LRU size based on client CPU count.
For systems that have many CPUs there is expected to be a correspondingly
higher number of files open and in use for a given node.
b=9462
adilger [Fri, 9 Dec 2005 00:26:07 +0000 (00:26 +0000)]
Branch b_release_1_4_6
Increase RPC tunable maximums for large Bull clients.
Does not affect default values.
adilger [Fri, 9 Dec 2005 00:22:22 +0000 (00:22 +0000)]
Branch b_release_1_4_6
Add comment for OBD_CONENCT_JOIN.
Avoid self-referential CROW description.
Remove large comment for OBD_CONNECT_TRUNCLOCK, it "hides" below flags.
green [Thu, 8 Dec 2005 18:21:13 +0000 (18:21 +0000)]
r=adilger(original author)
fix mds_get_md to recognise empty lmm for files without objects.
This fixes error messages from chown on such files.
green [Thu, 8 Dec 2005 14:44:01 +0000 (14:44 +0000)]
b=9896
Fix recently broken test.
wangdi [Thu, 8 Dec 2005 09:20:10 +0000 (09:20 +0000)]
Branch: b_release_1_4_6
log: land b1_4_join to b_release_1_4_6
r=nikita, alex, adilger
green [Wed, 7 Dec 2005 20:35:01 +0000 (20:35 +0000)]
ug 9297 changelog update
green [Wed, 7 Dec 2005 14:38:59 +0000 (14:38 +0000)]
b=9297
r=adilger
Stop sending data to evicted clients as soon as possible.
green [Wed, 7 Dec 2005 13:40:22 +0000 (13:40 +0000)]
b=9826
Add new __craynv architecture to the list of 64bit architectures for XT3
green [Wed, 7 Dec 2005 13:39:20 +0000 (13:39 +0000)]
b=9827
Fix declarations of ldlm_cli_enqueue, ldlm_lock_match, ldlm_resource_get and
ldlm_lock_Create to match actual function definitions
(__u32 type -> ldlm_lock_t type)
brian [Wed, 7 Dec 2005 13:29:28 +0000 (13:29 +0000)]
Make CONFIG_IEEE1394_OHCI1394 a module.
Remove duplicate options. I should have checked for these before I added the new ones at the
end of the file in the first place.
Some minor rearrangement to agree with make oldconfig.