The patch titled
lockdep-annotate-nfs-nfsd-in-kernel-sockets-tidy
has been added to the -mm tree. Its filename is
lockdep-annotate-nfs-nfsd-in-kernel-sockets-tidy.patch
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: lockdep-annotate-nfs-nfsd-in-kernel-sockets-tidy
From: Andrew Morton <akpm@xxxxxxxx>
futz with whitespace.
Cc: Peter Zijlstra <a.p.zijlstra@xxxxxxxxx>
CC: Steven Dickson <SteveD@xxxxxxxxxx>
Cc: Ingo Molnar <mingo@xxxxxxx>
Cc: Trond Myklebust <trond.myklebust@xxxxxxxxxx>
Cc: Neil Brown <neilb@xxxxxxx>
Cc: "David S. Miller" <davem@xxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
net/sunrpc/svcsock.c | 24 +++++++++++-------------
net/sunrpc/xprtsock.c | 24 +++++++++++-------------
2 files changed, 22 insertions(+), 26 deletions(-)
diff -puN net/sunrpc/svcsock.c~lockdep-annotate-nfs-nfsd-in-kernel-sockets-tidy net/sunrpc/svcsock.c
--- a/net/sunrpc/svcsock.c~lockdep-annotate-nfs-nfsd-in-kernel-sockets-tidy
+++ a/net/sunrpc/svcsock.c
@@ -93,20 +93,18 @@ static inline void svc_reclassify_socket
struct sock *sk = sock->sk;
BUG_ON(sk->sk_lock.owner != NULL);
switch (sk->sk_family) {
- case AF_INET:
- sock_lock_init_class_and_name(sk,
- "slock-AF_INET-NFSD", &svc_slock_key[0],
- "sk_lock-AF_INET-NFSD", &svc_key[0]);
- break;
-
- case AF_INET6:
- sock_lock_init_class_and_name(sk,
- "slock-AF_INET6-NFSD", &svc_slock_key[1],
- "sk_lock-AF_INET6-NFSD", &svc_key[1]);
- break;
+ case AF_INET:
+ sock_lock_init_class_and_name(sk, "slock-AF_INET-NFSD",
+ &svc_slock_key[0], "sk_lock-AF_INET-NFSD", &svc_key[0]);
+ break;
- default:
- BUG();
+ case AF_INET6:
+ sock_lock_init_class_and_name(sk, "slock-AF_INET6-NFSD",
+ &svc_slock_key[1], "sk_lock-AF_INET6-NFSD", &svc_key[1]);
+ break;
+
+ default:
+ BUG();
}
}
#else
diff -puN net/sunrpc/xprtsock.c~lockdep-annotate-nfs-nfsd-in-kernel-sockets-tidy net/sunrpc/xprtsock.c
--- a/net/sunrpc/xprtsock.c~lockdep-annotate-nfs-nfsd-in-kernel-sockets-tidy
+++ a/net/sunrpc/xprtsock.c
@@ -1067,20 +1067,18 @@ static inline void xs_reclassify_socket(
struct sock *sk = sock->sk;
BUG_ON(sk->sk_lock.owner != NULL);
switch (sk->sk_family) {
- case AF_INET:
- sock_lock_init_class_and_name(sk,
- "slock-AF_INET-NFS", &xs_slock_key[0],
- "sk_lock-AF_INET-NFS", &xs_key[0]);
- break;
-
- case AF_INET6:
- sock_lock_init_class_and_name(sk,
- "slock-AF_INET6-NFS", &xs_slock_key[1],
- "sk_lock-AF_INET6-NFS", &xs_key[1]);
- break;
+ case AF_INET:
+ sock_lock_init_class_and_name(sk, "slock-AF_INET-NFS",
+ &xs_slock_key[0], "sk_lock-AF_INET-NFS", &xs_key[0]);
+ break;
+
+ case AF_INET6:
+ sock_lock_init_class_and_name(sk, "slock-AF_INET6-NFS",
+ &xs_slock_key[1], "sk_lock-AF_INET6-NFS", &xs_key[1]);
+ break;
- default:
- BUG();
+ default:
+ BUG();
}
}
#else
_
Patches currently in -mm which might be from akpm@xxxxxxxx are
i386-irqs-build-fix.patch
kauditd_thread-warning-fix.patch
fix-warn_on--warn_on_once-regression.patch
irq_reqs-export-__irq_regs.patch
slab-reduce-numa-text-size.patch
revert-pci-quirk-for-ibm-dock-ii-cardbus-controllers.patch
x86_64-irq_regs-fix.patch
ext4_blk_type_from_sector_t_to_ulonglong-fix.patch
ext4-uninline-ext4_get_group_no_and_offset.patch
ext4-64-bit-divide-fix.patch
ext4-rename-logic_sb_block.patch
ext4-whitespace-cleanups.patch
git-acpi.patch
acpi-preserve-correct-battery-state-through-suspend-resume-cycles-tidy.patch
acpi-asus-s3-resume-fix.patch
sony_apci-resume.patch
git-cifs-fixup.patch
cifs-kconfig-dont-select-connector.patch
w1-kconfig-fix.patch
git-geode-fixup.patch
git-input-fixup.patch
libata-return-sense-data-in-hdio_drive_cmd-ioctl-tidy.patch
git-netdev-all.patch
libphy-dont-do-that.patch
forcedeth-power-management-support-tidy.patch
drivers-net-ns83820c-add-paramter-to-disable-auto.patch
git-pcmcia-fixup.patch
git-serial-fixup.patch
pci-optionally-sort-device-lists-breadth-first-tweaks.patch
pci-optionally-sort-device-lists-breadth-first-force-on.patch
git-scsi-target-fixup.patch
git-scsi-target-vs-git-block.patch
revert-gregkh-usb-usb-ehci-hcd-split-scan_periodic-to-reuse-code-for-spanned-completions.patch
xpad-dance-pad-support-tidy.patch
git-watchdog.patch
x86_64-dump_trace-atomicity-fix.patch
spinlock-debug-all-cpu-backtrace.patch
spinlock-debug-all-cpu-backtrace-fix.patch
spinlock-debug-all-cpu-backtrace-fix-2.patch
spinlock-debug-all-cpu-backtrace-fix-3.patch
xfs-rename-uio_read.patch
touchkit-ps-2-touchscreen-driver-regs-fix.patch
direct-io-sync-and-invalidate-file-region-when-falling-back-to-buffered-write-fixes.patch
get-rid-of-zone_table.patch
swap-token-new-scheme-to-preempt-token-tidy.patch
radix-tree-rcu-lockless-readside.patch
acx1xx-wireless-driver.patch
swsusp-add-resume_offset-command-line-parameter-rev-2.patch
deprecate-smbfs-in-favour-of-cifs.patch
edac-new-opteron-athlon64-memory-controller-driver.patch
add-address_space_operationsbatch_write.patch
add-config_headers_check-option-to-automatically-run-make-headers_check-nobble.patch
kbuild-dont-put-temp-files-in-the-source-tree.patch
grow_buffers-infinite-loop-fix.patch
invalidate_inode_pages2_range-debug.patch
lockdep-annotate-nfs-nfsd-in-kernel-sockets-tidy.patch
generic-implementatation-of-bug.patch
generic-implementatation-of-bug-fix.patch
generic-bug-for-i386.patch
generic-bug-for-x86-64.patch
fs-cache-provide-a-filesystem-specific-syncable-page-bit-ext4.patch
fs-cache-make-kafs-use-fs-cache-fix.patch
fs-cache-make-kafs-use-fs-cache-vs-streamline-generic_file_-interfaces-and-filemap.patch
nfs-use-local-caching-12-fix.patch
swap_prefetch-vs-zoned-counters.patch
readahead-sysctl-parameters.patch
make-copy_from_user_inatomic-not-zero-the-tail-on-i386-vs-reiser4.patch
make-kmem_cache_destroy-return-void-reiser4.patch
reiser4-hardirq-include-fix.patch
reiser4-run-truncate_inode_pages-in-reiser4_delete_inode.patch
reiser4-get_sb_dev-fix.patch
reiser4-vs-zoned-allocator.patch
reiser4-rename-generic_sounding_globalspatch-fix.patch
hpt3xx-rework-rate-filtering-tidy.patch
gtod-persistent-clock-support-i386.patch
hrtimers-state-tracking.patch
clockevents-drivers-for-i386.patch
kevent-core-files-fix.patch
kevent-core-files-s390-hack.patch
kevent-socket-notifications-fix-2.patch
kevent-socket-notifications-fix-4.patch
nr_blockdev_pages-in_interrupt-warning.patch
device-suspend-debug.patch
slab-leaks3-default-y.patch
x86-kmap_atomic-debugging.patch
restore-rogue-readahead-printk.patch
put_bh-debug.patch
acpi_format_exception-debug.patch
jmicron-warning-fix.patch
squash-ipc-warnings.patch
squash-transmeta-warnings.patch
squash-udf-warnings.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
