The patch titled
add-an-anonymous-inode-source-tidy
has been removed from the -mm tree. Its filename was
add-an-anonymous-inode-source-tidy.patch
This patch was dropped because an updated version will be merged
------------------------------------------------------
Subject: add-an-anonymous-inode-source-tidy
From: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
- use magic.h
- 80 cols
Cc: Davide Libenzi <davidel@xxxxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
fs/anon_inodes.c | 20 +++-----------------
include/linux/magic.h | 1 +
2 files changed, 4 insertions(+), 17 deletions(-)
diff -puN fs/anon_inodes.c~add-an-anonymous-inode-source-tidy fs/anon_inodes.c
--- a/fs/anon_inodes.c~add-an-anonymous-inode-source-tidy
+++ a/fs/anon_inodes.c
@@ -9,6 +9,7 @@
#include <linux/poll.h>
#include <linux/slab.h>
#include <linux/init.h>
+#include <linux/magic.h>
#include <linux/fs.h>
#include <linux/mount.h>
#include <linux/module.h>
@@ -17,18 +18,11 @@
#include <asm/uaccess.h>
-
-
-#define AINOFS_MAGIC 0x09041934
-
-
static int ainofs_delete_dentry(struct dentry *dentry);
static struct inode *aino_getinode(void);
static struct inode *aino_mkinode(void);
static int ainofs_get_sb(struct file_system_type *fs_type, int flags,
- const char *dev_name, void *data, struct vfsmount *mnt);
-
-
+ const char *dev_name, void *data, struct vfsmount *mnt);
static struct vfsmount *aino_mnt __read_mostly;
static struct inode *aino_inode;
@@ -43,7 +37,6 @@ static struct dentry_operations ainofs_d
};
-
int aino_getfd(int *pfd, struct inode **pinode, struct file **pfile,
char const *name, const struct file_operations *fops, void *priv)
{
@@ -113,7 +106,6 @@ eexit_1:
return error;
}
-
static int ainofs_delete_dentry(struct dentry *dentry)
{
/*
@@ -124,13 +116,11 @@ static int ainofs_delete_dentry(struct d
return 1;
}
-
static struct inode *aino_getinode(void)
{
return igrab(aino_inode);
}
-
/*
* A single inode exist for all aino files. On the contrary of pipes,
* aino inodes has no per-instance data associated, so we can avoid
@@ -163,17 +153,14 @@ eexit_1:
return ERR_PTR(error);
}
-
static int ainofs_get_sb(struct file_system_type *fs_type, int flags,
- const char *dev_name, void *data, struct vfsmount *mnt)
+ const char *dev_name, void *data, struct vfsmount *mnt)
{
return get_sb_pseudo(fs_type, "aino:", NULL, AINOFS_MAGIC, mnt);
}
-
static int __init aino_init(void)
{
-
if (register_filesystem(&aino_fs_type))
goto epanic;
@@ -191,7 +178,6 @@ epanic:
panic("aino_init() failed\n");
}
-
static void __exit aino_exit(void)
{
iput(aino_inode);
diff -puN include/linux/magic.h~add-an-anonymous-inode-source-tidy include/linux/magic.h
--- a/include/linux/magic.h~add-an-anonymous-inode-source-tidy
+++ a/include/linux/magic.h
@@ -39,5 +39,6 @@
#define SMB_SUPER_MAGIC 0x517B
#define USBDEVICE_SUPER_MAGIC 0x9fa2
+#define AINOFS_MAGIC 0x09041934
#endif /* __LINUX_MAGIC_H__ */
_
Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are
origin.patch
proc-fix-linkage-with-config_sysctl=y-config_proc_sysctl=n.patch
revert-retries-in-ext3_prepare_write-violate-ordering-requirements.patch
revert-retries-in-ext4_prepare_write-violate-ordering-requirements.patch
slab-introduce-krealloc-fix.patch
git-acpi.patch
git-alsa.patch
git-alsa-fixup.patch
git-avr32.patch
git-avr32-fixup.patch
git-drm.patch
git-dvb.patch
git-gfs2-nmw.patch
git-ieee1394.patch
git-input.patch
git-kvm.patch
git-libata-all.patch
git-libata-all-ipr-fix.patch
libata-acpi-add-infrastructure-for-drivers-to-use-fix.patch
pata_acpi-restore-driver-fix.patch
revert-rm-pointless-dmaengine-exports.patch
git-md-accel-fix.patch
git-mmc-versus-uevent-use-add_uevent_var-instead-of-open-coding-it.patch
git-ubi.patch
git-netdev-all.patch
vioc-warning-fix.patch
vioc-cast-warning-fix.patch
git-e1000.patch
git-e1000-fixup-2.patch
git-parisc.patch
rm9000-serial-driver.patch
fix-gregkh-pci-pci-piggy-bus.patch
git-pciseg.patch
git-s390.patch
git-unionfs.patch
git-wireless.patch
git-wireless-fixup.patch
fix-x86_64-mm-sched-clock-share.patch
revert-x86_64-mm-change-sysenter_setup-to-__cpuinit-improve-__init-__initdata.patch
x86_64-inhibit-machine-from-asserting-an-nmi-when-doing-alt-sysrq-m-operation-tidy.patch
add-__gfp_movable-for-callers-to-flag-allocations-from-high-memory-that-may-be-migrated-fix.patch
mm-merge-populate-and-nopage-into-fault-fixes-nonlinear-tidy.patch
mm-merge-nopfn-into-fault-fix.patch
i386-use-pte_update_defer-in-ptep_test_and_clear_dirtyyoung-fix.patch
smaps-add-clear_refs-file-to-clear-reference-fix.patch
smaps-add-clear_refs-file-to-clear-reference-fix-fix-2.patch
bias-the-location-of-pages-freed-for-min_free_kbytes-in-the-same-max_order_nr_pages-blocks-tidy.patch
mm-move-common-segment-checks-to-separate-helper-function-v7-tidy.patch
driver_bfin_serial_core-update.patch
uml-driver-formatting-fixes-fix.patch
reduce-size-of-task_struct-on-64-bit-machines.patch
mm-shrink-parent-dentries-when-shrinking-slab.patch
merge-sys_clone-sys_unshare-nsproxy-and-namespace-fix-fix-fix.patch
add-an-anonymous-inode-source-tidy.patch
virtual_eisa_root_init-should-be-__init.patch
proc-maps-protection-fix.patch
proc-maps-protection-tidy.patch
proc-maps-protection-fix-2.patch
fix-cycladesh-for-x86_64-and-probably-others-fix.patch
rtc-add-rtc-rs5c313-driver-tidy.patch
rtc-add-rtc-rs5c313-driver-is-busted.patch
move-die-notifier-handling-to-common-code-fixes-2.patch
move-die-notifier-handling-to-common-code-fix-vmalloc_sync_all.patch
fix-sscanf-%n-match-at-end-of-input-string-tidy.patch
parport-dev-driver-model-support-powerpc-fix.patch
cache-pipe-buf-page-address-for-non-highmem-arch-fix.patch
cache-pipe-buf-page-address-for-non-highmem-arch-fix-tidy.patch
add-support-for-deferrable-timers-respun-tidy.patch
linux-sysdevh-needs-to-include-linux-moduleh.patch
time-smp-friendly-alignment-of-struct-clocksource.patch
move-timekeeping-code-to-timekeepingc-fix.patch
define-and-use-new-eventscpu_lock_acquire-and-cpu_lock_release.patch
call-cpu_chain-with-cpu_down_failed-if-cpu_down_prepare-failed-vs-reduce-size-of-task_struct-on-64-bit-machines.patch
speedup-divides-by-cpu_power-in-scheduler.patch
lutimesat-compat-syscall-and-wire-up-on-x86_64.patch
declare-struct-ktime.patch
make-futex_wait-use-an-hrtimer-for-timeout-fix.patch
sys_futex64-allows-64bit-futexes-workaround.patch
proc-maps-protection-vs-utrace.patch
utrace-prep-2.patch
utrace-vs-reduce-size-of-task_struct-on-64-bit-machines.patch
utrace-printk-borkage.patch
utrace-x86_64-fix.patch
atomich-add-atomic64-cmpxchg-xchg-and-add_unless-to-powerpc.patch
local_t-powerpc-extension.patch
linux-kernel-markers-i386-optimization-fix.patch
revoke-core-code-fix-shared-mapping-revoke.patch
fbdev-hecuba-framebuffer-driver.patch
integrity-new-hooks-fix.patch
integrity-evm-as-an-integrity-service-provider-tidy.patch
integrity-evm-as-an-integrity-service-provider-tidy-fix.patch
integrity-evm-as-an-integrity-service-provider-tidy-fix-2.patch
integrity-ima-integrity_measure-support-tidy.patch
integrity-ima-integrity_measure-support-fix.patch
integrity-ima-integrity_measure-support-fix-2.patch
integrity-tpm-internal-kernel-interface-tidy.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
