The patch titled
remove fs/jffs2/ioctl.c
has been removed from the -mm tree. Its filename is
remove-fs-jffs2-ioctlc.patch
This patch was probably dropped from -mm because
it has now been merged into a subsystem tree or
into Linus's tree, or because it was folded into
its parent patch in the -mm tree.
------------------------------------------------------
Subject: remove fs/jffs2/ioctl.c
From: Adrian Bunk <bunk@xxxxxxxxx>
There doesn't seem to be any reason for keeping fs/jffs2/ioctl.c .
Signed-off-by: Adrian Bunk <bunk@xxxxxxxxx>
Cc: David Woodhouse <dwmw2@xxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
fs/jffs2/Makefile | 2 +-
fs/jffs2/dir.c | 1 -
fs/jffs2/file.c | 1 -
fs/jffs2/ioctl.c | 23 -----------------------
fs/jffs2/os-linux.h | 3 ---
5 files changed, 1 insertion(+), 29 deletions(-)
diff -puN fs/jffs2/dir.c~remove-fs-jffs2-ioctlc fs/jffs2/dir.c
--- devel/fs/jffs2/dir.c~remove-fs-jffs2-ioctlc 2006-05-19 16:00:38.000000000 -0700
+++ devel-akpm/fs/jffs2/dir.c 2006-05-19 16:00:38.000000000 -0700
@@ -41,7 +41,6 @@ const struct file_operations jffs2_dir_o
{
.read = generic_read_dir,
.readdir = jffs2_readdir,
- .ioctl = jffs2_ioctl,
.fsync = jffs2_fsync
};
diff -puN fs/jffs2/file.c~remove-fs-jffs2-ioctlc fs/jffs2/file.c
--- devel/fs/jffs2/file.c~remove-fs-jffs2-ioctlc 2006-05-19 16:00:38.000000000 -0700
+++ devel-akpm/fs/jffs2/file.c 2006-05-19 16:00:38.000000000 -0700
@@ -44,7 +44,6 @@ const struct file_operations jffs2_file_
.open = generic_file_open,
.read = generic_file_read,
.write = generic_file_write,
- .ioctl = jffs2_ioctl,
.mmap = generic_file_readonly_mmap,
.fsync = jffs2_fsync,
.sendfile = generic_file_sendfile
diff -L fs/jffs2/ioctl.c -puN fs/jffs2/ioctl.c~remove-fs-jffs2-ioctlc /dev/null
--- devel/fs/jffs2/ioctl.c
+++ /dev/null 2006-05-19 15:26:20.261540500 -0700
@@ -1,23 +0,0 @@
-/*
- * JFFS2 -- Journalling Flash File System, Version 2.
- *
- * Copyright (C) 2001-2003 Red Hat, Inc.
- *
- * Created by David Woodhouse <dwmw2@xxxxxxxxxxxxx>
- *
- * For licensing information, see the file 'LICENCE' in this directory.
- *
- * $Id: ioctl.c,v 1.10 2005/11/07 11:14:40 gleixner Exp $
- *
- */
-
-#include <linux/fs.h>
-
-int jffs2_ioctl(struct inode *inode, struct file *filp, unsigned int cmd,
- unsigned long arg)
-{
- /* Later, this will provide for lsattr.jffs2 and chattr.jffs2, which
- will include compression support etc. */
- return -ENOTTY;
-}
-
diff -puN fs/jffs2/Makefile~remove-fs-jffs2-ioctlc fs/jffs2/Makefile
--- devel/fs/jffs2/Makefile~remove-fs-jffs2-ioctlc 2006-05-19 16:00:38.000000000 -0700
+++ devel-akpm/fs/jffs2/Makefile 2006-05-19 16:00:38.000000000 -0700
@@ -6,7 +6,7 @@
obj-$(CONFIG_JFFS2_FS) += jffs2.o
-jffs2-y := compr.o dir.o file.o ioctl.o nodelist.o malloc.o
+jffs2-y := compr.o dir.o file.o nodelist.o malloc.o
jffs2-y += read.o nodemgmt.o readinode.o write.o scan.o gc.o
jffs2-y += symlink.o build.o erase.o background.o fs.o writev.o
jffs2-y += super.o debug.o
diff -puN fs/jffs2/os-linux.h~remove-fs-jffs2-ioctlc fs/jffs2/os-linux.h
--- devel/fs/jffs2/os-linux.h~remove-fs-jffs2-ioctlc 2006-05-19 16:00:38.000000000 -0700
+++ devel-akpm/fs/jffs2/os-linux.h 2006-05-19 16:00:38.000000000 -0700
@@ -167,9 +167,6 @@ extern struct address_space_operations j
int jffs2_fsync(struct file *, struct dentry *, int);
int jffs2_do_readpage_unlock (struct inode *inode, struct page *pg);
-/* ioctl.c */
-int jffs2_ioctl(struct inode *, struct file *, unsigned int, unsigned long);
-
/* symlink.c */
extern struct inode_operations jffs2_symlink_inode_operations;
_
Patches currently in -mm which might be from bunk@xxxxxxxxx are
git-acpi.patch
acpiphp-use-new-dock-driver.patch
git-dvb.patch
git-gfs2.patch
git-intelfb.patch
git-mtd.patch
git-netdev-all.patch
drivers-char-hw_randomc-remove-asserts.patch
git-nfs.patch
gregkh-pci-acpiphp-configure-_prt-v3-cleanup.patch
drivers-scsi-aic7xxx-possible-cleanups.patch
drivers-scsi-small-cleanups.patch
drivers-scsi-megaraidc-add-a-dummy-mega_create_proc_entry-for-proc_fs=y.patch
drivers-scsi-qla2xxx-make-some-functions-static.patch
drivers-scsi-aic7xxx-aic79xx_corec-make-ahd_done_with_status-static.patch
remove-drivers-scsi-constantscscsi_print_req_sense.patch
drivers-scsi-aic7xxx-aic79xx_corec-make-ahd_match_scb-static.patch
drivers-scsi-aic7xxx-possible-cleanups-2.patch
drivers-scsi-gdthc-make-__gdth_execute-static.patch
x86_64-unexport-ia32_sys_call_table.patch
swsusp-rework-memory-shrinker-rev-2.patch
acx1xx-wireless-driver.patch
arch-i386-kernel-apicc-make-modern_apic-static.patch
kernel-power-snapshotc-cleanups.patch
remove-fs-jffs2-ioctlc.patch
fs-locksc-make-posix_locks_deadlock-static.patch
remove-config_parport_arc-drivers-parport-parport_arcc.patch
fs-fat-miscc-unexport-fat_sync_bhs.patch
the-scheduled-unexport-of-insert_resource.patch
fs-bufferc-possible-cleanups.patch
drivers-md-raid6algosc-fix-a-null-dereference.patch
drivers-char-applicomc-proper-module_initexit.patch
kernel-sysc-cleanups.patch
kernel-sysc-cleanups-fix.patch
time-i386-clocksource-drivers.patch
fbdev-cleanup-the-config_video_select-mess.patch
fbdev-remove-duplicate-includes.patch
fbdev-remove-unused-exports.patch
md-make-md_print_devices-static.patch
slab-cache-shrinker-statistics.patch
i386-enable-4k-stacks-by-default.patch
mutex-subsystem-synchro-test-module.patch
drivers-char-ipmi-ipmi_msghandlerc-make-proc_ipmi_root-static.patch
drivers-message-i2o-iopc-unexport-i2o_msg_nop.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
