AgeCommit message (Collapse)Author
2007-07-19SELinux: enable dynamic activation/deactivation of NetLabel/SELinux enforcementPaul Moore
Create a new NetLabel KAPI interface, netlbl_enabled(), which reports on the current runtime status of NetLabel based on the existing configuration. LSMs that make use of NetLabel, i.e. SELinux, can use this new function to determine if they should perform NetLabel access checks. This patch changes the NetLabel/SELinux glue code such that SELinux only enforces NetLabel related access checks when netlbl_enabled() returns true. At present NetLabel is considered to be enabled when there is at least one labeled protocol configuration present. The result is that by default NetLabel is considered to be disabled, however, as soon as an administrator configured a CIPSO DOI definition NetLabel is enabled and SELinux starts enforcing NetLabel related access controls - including unlabeled packet controls. This patch also tries to consolidate the multiple "#ifdef CONFIG_NETLABEL" blocks into a single block to ease future review as recommended by Linus. Signed-off-by: Paul Moore <> Signed-off-by: James Morris <>
2007-07-18Merge branch 'isdn-fix' of ↵Linus Torvalds * 'isdn-fix' of ISDN HiSax: uninitialized return in hisax_cs_setup
2007-07-18Merge branch 'upstream-linus' of ↵Linus Torvalds * 'upstream-linus' of eHEA: Fix bonding support Blackfin ethernet driver: on chip ethernet MAC controller driver fix wrong argument of tc35815_read_plat_dev_addr() ARM/ETHER3: Handle multicast frames. SAA9730: Handle multicast frames. NI5010: Handle multicast frames. NS83820: Handle multicast frames. Fix RGMII-ID handling in gianfar Fix Vitesse RGMII-ID support Add phy-connection-type to gianfar nodes Fix Vitesse 824x PHY interrupt acking [PATCH] zd1211rw: Add ID for Siemens Gigaset USB Stick 54 [PATCH] zd1211rw: Add ID for Planex GW-US54GXS [PATCH] Update version ipw2200 stamp to 1.2.2 [PATCH] ipw2200: Fix ipw_isr() comments error on shared IRQ [PATCH] Fix ipw2200 set wrong power parameter causing firmware error [PATCH] ipw2100: Fix `iwpriv set_power` error [PATCH] softmac: Channel is listed twice in scan output
2007-07-18Merge git:// Torvalds
* git:// (24 commits) [CIFS] merge conflict in fs/cifs/export.c [CIFS] Allow disabling CIFS Unix Extensions as mount option [CIFS] More whitespace/formatting fixes (noticed by checkpatch) [CIFS] Typo in previous patch [CIFS] zero_user_page() conversions [CIFS] use simple_prepare_write to zero page data [CIFS] Fix build break - inet.h not included when experimental ifdef off [CIFS] Add support for new POSIX unlink [CIFS] whitespace/formatting fixes [CIFS] Fix oops in cifs_create when nfsd server exports cifs mount [CIFS] whitespace cleanup [CIFS] Fix packet signatures for NTLMv2 case [CIFS] more whitespace fixes [CIFS] more whitespace cleanup [CIFS] whitespace cleanup [CIFS] whitespace cleanup [CIFS] ipv6 support no longer experimental [CIFS] Mount should fail if server signing off but client mount option requires it [CIFS] whitespace fixes [CIFS] Fix sign mount option and sign proc config setting ...
2007-07-18Merge Torvalds
* zh_CN/HOWTO: update URLs of git trees Chinese translation of Documentation/stable_api_nonsense.txt HOWTO: add Chinese translation of Documentation/HOWTO Documentation: add Japanese translated stable_api_nonsense.txt HOWTO: add Japanese translation of Documentation/HOWTO
2007-07-18Merge Torvalds
* sysfs: cosmetic clean up on node creation failure paths sysfs: kill an extra put in sysfs_create_link() failure path Driver core: check return code of sysfs_create_link() HOWTO: Add the knwon_regression URI to the documentation dev_vdbg() documentation dev_vdbg(), available with -DVERBOSE_DEBUG sysfs: make sysfs_init_inode() static sysfs: fix sysfs root inode nlink accounting Documentation fix devres.txt: lib/iomap.c -> lib/devres.c sysfs: avoid kmem_cache_free(NULL) PM: remove deprecated dpm_runtime_* routines PM: Remove deprecated sysfs files Driver core: accept all valid action-strings in uevent-trigger debugfs: remove rmdir() non-empty complaint
2007-07-18Merge Torvalds
* UIO: Hilscher CIF card driver UIO: Documentation UIO: Add the User IO core code
2007-07-18Merge branch 'for-linus' of git:// Torvalds
* 'for-linus' of git:// locks: fix vfs_test_lock() comment locks: make posix_test_lock() interface more consistent nfs: disable leases over NFS gfs2: stop giving out non-cluster-coherent leases locks: export setlease to filesystems locks: provide a file lease method enabling cluster-coherent leases locks: rename lease functions to reflect locks.c conventions locks: share more common lease code locks: clean up lease_alloc() locks: convert an -EINVAL return to a BUG leases: minor break_lease() comment clarification
2007-07-18Merge branch 'for-linus' of ↵Linus Torvalds * 'for-linus' of (29 commits) IB/mthca: Simplify use of size0 in work request posting IB/mthca: Factor out setting WQE UD segment entries IB/mthca: Factor out setting WQE remote address and atomic segment entries IB/mlx4: Factor out setting other WQE segments IB/mlx4: Factor out setting WQE data segment entries IB/mthca: Factor out setting WQE data segment entries IB/mlx4: Return receive queue sizes for userspace QPs from query QP IB/mlx4: Increase max outstanding RDMA reads as target RDMA/cma: Remove local write permission from QP access flags IB/mthca: Use uninitialized_var() for f0 IB/cm: Make internal function cm_get_ack_delay() static IB/ipath: Remove ipath_get_user_pages_nocopy() IB/ipath: Make a few functions static mlx4_core: Reset device when internal error is detected IB/iser: Make a couple of functions static IB/mthca: Fix printk format used for firmware version in warning IB/mthca: Schedule MSI support for removal IB/ehca: Fix warnings issued by IB/ehca: Restructure ehca_set_pagebuf() IB/ehca: MR/MW structure refactoring ...
2007-07-19Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6Steve French
Conflicts: fs/cifs/export.c
2007-07-19[CIFS] merge conflict in fs/cifs/export.cSteve French
Signed-off-by: Steve French <>
2007-07-18[CIFS] Allow disabling CIFS Unix Extensions as mount optionSteve French
Previously the only way to do this was to umount all mounts to that server, turn off a proc setting (/proc/fs/cifs/LinuxExtensionsEnabled). Fixes Samba bugzilla bug number: 4582 (and also 2008) Signed-off-by: Steve French <>
2007-07-18locks: fix vfs_test_lock() commentJ. Bruce Fields
Thanks to Doug Chapman for pointing out that the comment here is inconsistent with the function prototype. Signed-off-by: "J. Bruce Fields" <>
2007-07-18locks: make posix_test_lock() interface more consistentJ. Bruce Fields
Since posix_test_lock(), like fcntl() and ->lock(), indicates absence or presence of a conflict lock by setting fl_type to, respectively, F_UNLCK or something other than F_UNLCK, the return value is no longer needed. Signed-off-by: "J. Bruce Fields" <>
2007-07-18nfs: disable leases over NFSJ. Bruce Fields
As Peter Staubach says elsewhere ( > The problem is that some file system such as NFSv2 and NFSv3 do > not have sufficient support to be able to support leases correctly. > In particular for these two file systems, there is no over the wire > protocol support. > > Currently, these two file systems fail the fcntl(F_SETLEASE) call > accidentally, due to a reference counting difference. These file > systems should fail more consciously, with a proper error to > indicate that the call is invalid for them. Define an nfs setlease method that just returns -EINVAL. If someone can demonstrate a real need, perhaps we could reenable them in the presence of the "nolock" mount option. Signed-off-by: "J. Bruce Fields" <> Cc: Peter Staubach <> Cc: Trond Myklebust <>
2007-07-18gfs2: stop giving out non-cluster-coherent leasesMarc Eshel
Since gfs2 can't prevent conflicting opens or leases on other nodes, we probably shouldn't allow it to give out leases at all. Put the newly defined lease operation into use in gfs2 by turning off lease, unless we're using the "nolock' locking module (in which case all locking is local anyway). Signed-off-by: Marc Eshel <> Signed-off-by: J. Bruce Fields <> Cc: Steven Whitehouse <>
2007-07-18locks: export setlease to filesystemsJ. Bruce Fields
Export setlease so it can used by filesystems to implement their lease methods. Signed-off-by: "J. Bruce Fields" <>
2007-07-18locks: provide a file lease method enabling cluster-coherent leasesJ. Bruce Fields
Currently leases are only kept locally, so there's no way for a distributed filesystem to enforce them against multiple clients. We're particularly interested in the case of nfsd exporting a cluster filesystem, in which case nfsd needs cluster-coherent leases in order to implement delegations correctly. Also add some documentation. Signed-off-by: J. Bruce Fields <>
2007-07-18locks: rename lease functions to reflect locks.c conventionsJ. Bruce Fields
We've been using the convention that vfs_foo is the function that calls a filesystem-specific foo method if it exists, or falls back on a generic method if it doesn't; thus vfs_foo is what is called when some other part of the kernel (normally lockd or nfsd) wants to get a lock, whereas foo is what filesystems call to use the underlying local functionality as part of their lock implementation. So rename setlease to vfs_setlease (which will call a filesystem-specific setlease after a later patch) and __setlease to setlease. Also, vfs_setlease need only be GPL-exported as long as it's only needed by lockd and nfsd. Signed-off-by: "J. Bruce Fields" <>
2007-07-18locks: share more common lease codeJ. Bruce Fields
Share more code between setlease (used by nfsd) and fcntl. Also some minor cleanup. Signed-off-by: "J. Bruce Fields" <> Acked-by: Christoph Hellwig <>
2007-07-18locks: clean up lease_alloc()J. Bruce Fields
Return the newly allocated structure as the return value instead of using a struct ** parameter. Signed-off-by: J. Bruce Fields <>
2007-07-18locks: convert an -EINVAL return to a BUGJ. Bruce Fields
There's no point trying to return an error in these cases, which all represent bugs in the callers. Signed-off-by: J. Bruce Fields <>
2007-07-18leases: minor break_lease() comment clarificationdavid m. richter
clarify that break_lease() checks for presence of any lock, not just leases. Signed-off-by: David M. Richter <> Signed-off-by: "J. Bruce Fields" <>
2007-07-18zh_CN/HOWTO: update URLs of git treesLi Yang
Addressing patch from Stefan Richter: HOWTO: update URLs of git trees (It will be better if we update this to commit-id later) Signed-off-by: Li Yang <> Signed-off-by: Greg Kroah-Hartman <>
2007-07-18Chinese translation of Documentation/stable_api_nonsense.txtTripleX
This is a Chinese translated version of Documentation/stable_api_nonsense.txt. From: TripleX <> Signed-off-by: WANG Cong <> Signed-off-by: Li Yang <> Signed-off-by: Greg Kroah-Hartman <>
2007-07-18HOWTO: add Chinese translation of Documentation/HOWTOLi Yang
This is a Chinese translated version of Documentation/HOWTO. Currently Chinese involvement in Linux kernel is very low, especially comparing to its largest population base. Language could be the main obstacle. Hope this document will help more Chinese to contribute to Linux kernel. Signed-off-by: Li Yang <> Signed-off-by: TripleX Chung <> Signed-off-by: Maggie Chen <> Signed-off-by: WANG Cong <> Signed-off-by: Greg Kroah-Hartman <>
2007-07-18Documentation: add Japanese translated stable_api_nonsense.txtIKEDA, Munehiro
Signed-off-by: IKEDA, Munehiro <> Signed-off-by: Greg Kroah-Hartman <>
2007-07-18HOWTO: add Japanese translation of Documentation/HOWTOTsugikazu Shibata
Add the japanese translation of the Documentation/HOWTO file. Signed-off-by: Tsugikazu Shibata <> Cc: IKEDA Munehiro <> Signed-off-by: Greg Kroah-Hartman <>
2007-07-18UIO: Hilscher CIF card driverHans-Jürgen Koch
this is a patch that adds support for Hilscher CIF DeviceNet and Profibus cards. I tested it on a Kontron CPX board, and Thomas reviewed it. You can find the user space part here: Notes: cif_api.c is the main file you want to look at. It contains the functions to open, close, mmap and so on. cif_dps.c adds functions specific to Profibus cards, and cif_dn.c contains functions for DeviceNet cards. cif.c is a universal playground, it's just a small test program. The user space part of this UIO driver is still work in progress, and not everything is tested yet. At the moment, the thread in cif_api.c contains some code that artificially makes the card generate interrupts, this was added for testing and will be removed later. But the driver already contains all the functions needed for useful operation, so it gives a good idea of how such a thing looks like. For comparison, here's what you get from the manufacturer ( when you ask for a Linux 2.6 driver: WARNING: Don't look at the code for too long, you might become sick :-) Signed-off-by: Hans-Jürgen Koch <> Signed-off-by: Greg Kroah-Hartman <>
2007-07-18UIO: DocumentationHans J. Koch
Documentation for the UIO interface From: Hans J. Koch <> Signed-off-by: Greg Kroah-Hartman <>
2007-07-18UIO: Add the User IO core codeHans J. Koch
This interface allows the ability to write the majority of a driver in userspace with only a very small shell of a driver in the kernel itself. It uses a char device and sysfs to interact with a userspace process to process interrupts and control memory accesses. See the docbook documentation for more details on how to use this interface. From: Hans J. Koch <> Cc: Thomas Gleixner <> Cc: Benedikt Spranger <> Signed-off-by: Greg Kroah-Hartman <>
2007-07-18sysfs: cosmetic clean up on node creation failure pathsTejun Heo
Node addition failure is detected by testing return value of sysfs_addfm_finish() which returns the number of added and removed nodes. As the function is called as the last step of addition right on top of error handling block, the if blocks looked like the following. if (sysfs_addrm_finish(&acxt)) success handling, usually return; /* fall through to error handling */ This is the opposite of usual convention in sysfs and makes the code difficult to understand. This patch inverts the test and makes those blocks look more like others. Signed-off-by: Tejun Heo <> Cc: Gabriel C <> Cc: Miles Lane <> Signed-off-by: Greg Kroah-Hartman <>
2007-07-18sysfs: kill an extra put in sysfs_create_link() failure pathTejun Heo
There is a subtle bug in sysfs_create_link() failure path. When symlink creation fails because there's already a node with the same name, the target sysfs_dirent is put twice - once by failure path of sysfs_create_link() and once more when the symlink is released. Fix it by making only the symlink node responsible for putting target_sd. Signed-off-by: Tejun Heo <> Cc: Gabriel C <> Cc: Miles Lane <> Signed-off-by: Greg Kroah-Hartman <>
2007-07-18Driver core: check return code of sysfs_create_link()Cornelia Huck
Check for return value of sysfs_create_link() in device_add() and device_rename(). Add helper functions device_add_class_symlinks() and device_remove_class_symlinks() to make the code easier to read. [ fix unused var warnings] Signed-off-by: Cornelia Huck <> Acked-by: Jeff Garzik <> Signed-off-by: Andrew Morton <> Signed-off-by: Greg Kroah-Hartman <>
2007-07-18HOWTO: Add the knwon_regression URI to the documentationPaolo Ciarrocchi
We should let everybody know about where the regression list is hosted. The more is known the more it is used. Signed-off-by: Paolo Ciarrocchi <> Cc: Li Yang <> Cc: TripleX Chung <> Cc: Maggie Chen <> Cc: WANG Cong <> Cc: Tsugikazu Shibata <> Cc: IKEDA Munehiro <> Signed-off-by: Greg Kroah-Hartman <>
2007-07-18dev_vdbg() documentationDavid Brownell
Update CodingStyle to talk about "-DDEBUG" message conventions and the new "-DVERBOSE_DEBUG" convention. Signed-off-by: David Brownell <> Signed-off-by: Andrew Morton <> Signed-off-by: Greg Kroah-Hartman <>
2007-07-18dev_vdbg(), available with -DVERBOSE_DEBUGDavid Brownell
This defines a dev_vdbg() call, which is enabled with -DVERBOSE_DEBUG. When enabled, dev_vdbg() acts just like dev_dbg(). When disabled, it is a NOP ... just like dev_dbg() without -DDEBUG. The specific code was moved out of a USB patch, but lots of drivers have similar support. That is, code can now be written to use an additional level of debug output, selected at compile time. Many driver authors have found this idiom to be very useful. A typical usage model is for "normal" debug messages to focus on fault paths and not be very "chatty", so that those messages can be left on during normal operation without much of a performance or syslog load. On the other hand "verbose" messages would be noisy enough that they wouldn't normally be enabled; they might even affect timings enough to change system or driver behavior. Signed-off-by: David Brownell <> Signed-off-by: Andrew Morton <> Signed-off-by: Greg Kroah-Hartman <>
2007-07-18sysfs: make sysfs_init_inode() staticTejun Heo
With sysfs_fill_super() converted to use sysfs_get_inode(), there is no user of sysfs_init_inode() outside of fs/sysfs/inode.c. Make it static. Signed-off-by: Tejun Heo <> Acked-by: Jean Delvare <> Signed-off-by: Greg Kroah-Hartman <>
2007-07-18sysfs: fix sysfs root inode nlink accountingTejun Heo
While making sysfs indoes hashed, sysfs root inode was left out. Now that nlink accounting depends on the inode being on the hash, sysfs root inode nlink isn't adjusted properly. Put sysfs root inode on the inode hash by allocating it using sysfs_get_inode() like other sysfs inodes. While at it, massage comments a bit. Signed-off-by: Tejun Heo <> Acked-by: Jean Delvare <> Signed-off-by: Greg Kroah-Hartman <>
2007-07-18Documentation fix devres.txt: lib/iomap.c -> lib/devres.cBrandon Philips
Signed-off-by: Brandon Philips <> Acked-by: Tejun Heo <> Signed-off-by: Greg Kroah-Hartman <>
2007-07-18sysfs: avoid kmem_cache_free(NULL)Akinobu Mita
kmem_cache_free() with NULL is not allowed. But it may happen if out of memory error is triggered in sysfs_new_dirent(). This patch fixes that error handling. Signed-off-by: Akinobu Mita <> Signed-off-by: Greg Kroah-Hartman <>
2007-07-18PM: remove deprecated dpm_runtime_* routinesAlan Stern
This patch (as933) removes the deprecated dpm_runtime_suspend() and dpm_runtime_resume() routines from the PM core. The only user of those routines is the PCMCIA ds driver; local replacements are added. Signed-off-by: Alan Stern <> CC: Dominik Brodowski <> Signed-off-by: Greg Kroah-Hartman <>
2007-07-18PM: Remove deprecated sysfs filesAlan Stern
This patch (as932) removes the deprecated sysfs .../power/state attribute files. Signed-off-by: Alan Stern <> Acked-by: Pavel Machek <> Signed-off-by: Greg Kroah-Hartman <>
2007-07-18Driver core: accept all valid action-strings in uevent-triggerKay Sievers
This allows the uevent file to handle any type of uevent action to be triggered by userspace instead of just the "add" uevent. Signed-off-by: Kay Sievers <> Signed-off-by: Greg Kroah-Hartman <>
2007-07-18debugfs: remove rmdir() non-empty complaintJens Axboe
Hi, This patch kills the pointless debugfs rmdir() printk() when called on a non-empty directory. blktrace will sometimes have to call it a few times when forcefully ending a trace, which polutes the log with pointless warnings. Rationale: - It's more code to work-around this "problem" in the debugfs users, and you would have to add code to check for empty directories to do so (or assume that debugfs is using simple_ helpers, but that would be a layering violation). - Other rmdir() implementations don't complain about something this silly. Signed-off-by: Jens Axboe <> Signed-off-by: Greg Kroah-Hartman <>
2007-07-18eHEA: Fix bonding supportThomas Klein
The driver didn't allow an interface's MAC address to be modified if the respective interface wasn't setup - a failing Hcall was the result. Thus bonding wasn't usable. The fix moves the failing Hcall which was registering a MAC address for the reception of BC packets in firmware from the port up and down functions to the port resources setup functions. Additionally the missing update of the last_rx member of the netdev structure was added. Signed-off-by: Thomas Klein <> Signed-off-by: Jeff Garzik <>
2007-07-18Blackfin ethernet driver: on chip ethernet MAC controller driverBryan Wu
This patch implements the driver necessary use the Analog Devices Blackfin processor's on-chip ethernet MAC controller. [try#2] - add timeout control - kill dma_config_reg bitfields - some trivial cleanup [try#3] - add endianess check - add DRV_NAME, DRV_VERSION... driver information string - add some comments for silicon anomaly and dma API confusion - some code trivial cleanup [try#4] - add Blackfin latest GPIO pin mux opertion with Michael Hennerich's help and Dan's review - rewrite the DMA descriptor list operation in a more readable way by Joe's review [try#5] - cleanup some coding style by Joe's review. [try#6] - 1.1 version fix a bug when set up multicast list pointed by Mr. yoshfuji - rearrange the desc_list_free function. Signed-off-by: Michael Hennerich <> Signed-off-by: Bryan Wu <> Cc: Michael Buesch <> Cc: Mike Frysinger <> Cc: Jeff Garzik <> Cc: Christoph Hellwig <> Cc: Dan Williams <> Cc: Joe Perches <> Cc: YOSHIFUJI Hideaki <> Signed-off-by: Andrew Morton <> Signed-off-by: Jeff Garzik <>
2007-07-18fix wrong argument of tc35815_read_plat_dev_addr()Yoichi Yuasa
Fix wrong argument of tc35815_read_plat_dev_addr() Signed-off-by: Yoichi Yuasa <> Signed-off-by: Jeff Garzik <>
2007-07-18Merge branch 'upstream-jgarzik' of ↵Jeff Garzik
git:// into upstream
2007-07-18ARM/ETHER3: Handle multicast frames.YOSHIFUJI Hideaki / 吉藤英明
Signed-off-by: YOSHIFUJI Hideaki <> -- Signed-off-by: Jeff Garzik <>