The patch titled
ecryptfs-get_sb_dev-fix
has been removed from the -mm tree. Its filename is
ecryptfs-get_sb_dev-fix.patch
This patch was dropped because it was folded into ecryptfs-fs-makefile-and-fs-kconfig.patch
------------------------------------------------------
Subject: ecryptfs-get_sb_dev-fix
From: Andrew Morton <akpm@xxxxxxxx>
Update ecryptfs for dhowells API changes.
Cc: Michael Halcrow <mhalcrow@xxxxxxxxxx>
Cc: David Howells <dhowells@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
fs/ecryptfs/main.c | 26 +++++++++++++-------------
1 file changed, 13 insertions(+), 13 deletions(-)
diff -puN fs/ecryptfs/main.c~ecryptfs-get_sb_dev-fix fs/ecryptfs/main.c
--- a/fs/ecryptfs/main.c~ecryptfs-get_sb_dev-fix
+++ a/fs/ecryptfs/main.c
@@ -497,34 +497,34 @@ out:
* ecryptfs_interpolate to perform most of the linking
* ecryptfs_interpolate(): links the lower filesystem into ecryptfs
*/
-static struct super_block *ecryptfs_get_sb(struct file_system_type *fs_type,
- int flags, const char *dev_name,
- void *raw_data)
+static int ecryptfs_get_sb(struct file_system_type *fs_type, int flags,
+ const char *dev_name, void *raw_data,
+ struct vfsmount *mnt)
{
int rc;
- struct super_block *sb = NULL;
+ int ret;
+ struct super_block *sb;
- sb = get_sb_nodev(fs_type, flags, raw_data, ecryptfs_fill_super);
- if (IS_ERR(sb)) {
- ecryptfs_printk(KERN_ERR, "Getting sb failed. "
- "sb = [%p]\n", sb);
+ ret = get_sb_nodev(fs_type, flags, raw_data, ecryptfs_fill_super, mnt);
+ if (ret < 0) {
+ ecryptfs_printk(KERN_ERR, "Getting sb failed: %d\n", ret);
goto out;
}
+ sb = mnt->mnt_sb;
rc = ecryptfs_parse_options(sb, raw_data);
if (rc) {
deactivate_super(sb);
- sb = ERR_PTR(rc);
+ ret = rc;
goto out;
}
rc = ecryptfs_read_super(sb, dev_name);
if (rc) {
deactivate_super(sb);
- sb = ERR_PTR(rc);
- ecryptfs_printk(KERN_ERR, "Reading sb failed. "
- "sb = [%p]\n", sb);
+ ret = rc;
+ ecryptfs_printk(KERN_ERR, "Reading sb failed: %d\n", ret);
}
out:
- return sb;
+ return ret;
}
/**
_
Patches currently in -mm which might be from akpm@xxxxxxxx are
origin.patch
hdrcheck-permission-fix.patch
mmc-driver-for-ti-flashmedia-card-reader-source.patch
ecryptfs-fs-makefile-and-fs-kconfig.patch
ecryptfs-get_sb_dev-fix.patch
make-kmem_cache_destroy-return-void-ecryptfs.patch
ecryptfs-versioning-fixes-tidy.patch
readahead-sysctl-parameters-fix.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
fbdev-riva-warning-fix.patch
genirq-convert-the-i386-architecture-to-irq-chips.patch
genirq-x86_64-irq-reenable-migrating-irqs-to-other-cpus.patch
genirq-msi-simplify-msi-enable-and-disable.patch
genirq-ia64-irq-dynamic-irq-support.patch
genirq-msi-only-build-msi-apicc-on-ia64-fix.patch
genirq-i386-irq-remove-the-msi-assumption-that-irq-==-vector.patch
genirq-x86_64-irq-make-vector_irq-per-cpu-fix.patch
genirq-x86_64-irq-make-vector_irq-per-cpu-warning-fix.patch
add-hypertransport-capability-defines-fix.patch
initial-generic-hypertransport-interrupt-support-Kconfig-fix.patch
srcu-report-out-of-memory-errors-fixlet.patch
gtod-persistent-clock-support-i386-update-fix.patch
hrtimers-state-tracking-fix.patch
clockevents-drivers-for-i386-fix.patch
debugging-feature-timer-stats-fix.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-tcp-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
