* [PATCH] dmapi: kill last 2.4 compat leftovers
@ 2007-11-30 9:39 Christoph Hellwig
2007-12-21 6:37 ` Christoph Hellwig
0 siblings, 1 reply; 3+ messages in thread
From: Christoph Hellwig @ 2007-11-30 9:39 UTC (permalink / raw)
To: xfs
Signed-off-by: Christoph Hellwig <hch@lst.de>
Index: linux-2.6-xfs/fs/dmapi/dmapi_register.c
===================================================================
--- linux-2.6-xfs.orig/fs/dmapi/dmapi_register.c 2007-09-29 11:49:22.000000000 +0200
+++ linux-2.6-xfs/fs/dmapi/dmapi_register.c 2007-09-29 11:49:39.000000000 +0200
@@ -34,10 +34,8 @@
#include <linux/mm.h>
#include <linux/proc_fs.h>
#include <linux/module.h>
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
#include <linux/mount.h>
#include <linux/namei.h>
-#endif
#include <asm/uaccess.h>
#include <linux/fs.h>
#include <linux/file.h>
@@ -1520,33 +1518,6 @@ dm_getall_disp(
return(error);
}
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
-#define d_alloc_anon dmapi_alloc_anon
-static struct dentry *
-d_alloc_anon(struct inode *inode)
-{
- struct dentry *dentry;
-
- spin_lock(&dcache_lock);
- list_for_each_entry(dentry, &inode->i_dentry, d_alias) {
- if (!(dentry->d_flags & DCACHE_NFSD_DISCONNECTED))
- goto found;
- }
- spin_unlock(&dcache_lock);
-
- dentry = d_alloc_root(inode);
- if (likely(dentry != NULL))
- dentry->d_flags |= DCACHE_NFSD_DISCONNECTED;
- return dentry;
- found:
- dget_locked(dentry);
- dentry->d_vfs_flags |= DCACHE_REFERENCED;
- spin_unlock(&dcache_lock);
- iput(inode);
- return dentry;
-}
-#endif
-
int
dm_open_by_handle_rvp(
unsigned int fd,
Index: linux-2.6-xfs/fs/dmapi/dmapi_sysent.c
===================================================================
--- linux-2.6-xfs.orig/fs/dmapi/dmapi_sysent.c 2007-09-29 11:49:42.000000000 +0200
+++ linux-2.6-xfs/fs/dmapi/dmapi_sysent.c 2007-09-29 11:49:57.000000000 +0200
@@ -706,14 +706,6 @@ dmapi_init_procfs(int dmapi_minor)
entry = create_proc_read_entry( DMAPI_DBG_PROCFS "/summary",
0, NULL, dmapi_summary, NULL);
entry->owner = THIS_MODULE;
-
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
- entry = proc_mknod( DMAPI_PROCFS, S_IFCHR | S_IRUSR | S_IWUSR,
- NULL, mk_kdev(MISC_MAJOR,dmapi_minor));
- if( entry == NULL )
- return;
- entry->owner = THIS_MODULE;
-#endif
#endif
}
@@ -722,9 +714,6 @@ static void __exit
dmapi_cleanup_procfs(void)
{
#ifdef CONFIG_PROC_FS
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
- remove_proc_entry( DMAPI_PROCFS, NULL);
-#endif
remove_proc_entry( DMAPI_DBG_PROCFS "/summary", NULL);
remove_proc_entry( DMAPI_DBG_PROCFS "/fsreg", NULL);
remove_proc_entry( DMAPI_DBG_PROCFS "/sessions", NULL);
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH] dmapi: kill last 2.4 compat leftovers
2007-11-30 9:39 [PATCH] dmapi: kill last 2.4 compat leftovers Christoph Hellwig
@ 2007-12-21 6:37 ` Christoph Hellwig
2008-01-07 4:41 ` Donald Douwsma
0 siblings, 1 reply; 3+ messages in thread
From: Christoph Hellwig @ 2007-12-21 6:37 UTC (permalink / raw)
To: xfs
Any reason this didn't get in yet?
On Fri, Nov 30, 2007 at 10:39:09AM +0100, Christoph Hellwig wrote:
> Signed-off-by: Christoph Hellwig <hch@lst.de>
>
> Index: linux-2.6-xfs/fs/dmapi/dmapi_register.c
> ===================================================================
> --- linux-2.6-xfs.orig/fs/dmapi/dmapi_register.c 2007-09-29 11:49:22.000000000 +0200
> +++ linux-2.6-xfs/fs/dmapi/dmapi_register.c 2007-09-29 11:49:39.000000000 +0200
> @@ -34,10 +34,8 @@
> #include <linux/mm.h>
> #include <linux/proc_fs.h>
> #include <linux/module.h>
> -#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
> #include <linux/mount.h>
> #include <linux/namei.h>
> -#endif
> #include <asm/uaccess.h>
> #include <linux/fs.h>
> #include <linux/file.h>
> @@ -1520,33 +1518,6 @@ dm_getall_disp(
> return(error);
> }
>
> -#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
> -#define d_alloc_anon dmapi_alloc_anon
> -static struct dentry *
> -d_alloc_anon(struct inode *inode)
> -{
> - struct dentry *dentry;
> -
> - spin_lock(&dcache_lock);
> - list_for_each_entry(dentry, &inode->i_dentry, d_alias) {
> - if (!(dentry->d_flags & DCACHE_NFSD_DISCONNECTED))
> - goto found;
> - }
> - spin_unlock(&dcache_lock);
> -
> - dentry = d_alloc_root(inode);
> - if (likely(dentry != NULL))
> - dentry->d_flags |= DCACHE_NFSD_DISCONNECTED;
> - return dentry;
> - found:
> - dget_locked(dentry);
> - dentry->d_vfs_flags |= DCACHE_REFERENCED;
> - spin_unlock(&dcache_lock);
> - iput(inode);
> - return dentry;
> -}
> -#endif
> -
> int
> dm_open_by_handle_rvp(
> unsigned int fd,
> Index: linux-2.6-xfs/fs/dmapi/dmapi_sysent.c
> ===================================================================
> --- linux-2.6-xfs.orig/fs/dmapi/dmapi_sysent.c 2007-09-29 11:49:42.000000000 +0200
> +++ linux-2.6-xfs/fs/dmapi/dmapi_sysent.c 2007-09-29 11:49:57.000000000 +0200
> @@ -706,14 +706,6 @@ dmapi_init_procfs(int dmapi_minor)
> entry = create_proc_read_entry( DMAPI_DBG_PROCFS "/summary",
> 0, NULL, dmapi_summary, NULL);
> entry->owner = THIS_MODULE;
> -
> -#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
> - entry = proc_mknod( DMAPI_PROCFS, S_IFCHR | S_IRUSR | S_IWUSR,
> - NULL, mk_kdev(MISC_MAJOR,dmapi_minor));
> - if( entry == NULL )
> - return;
> - entry->owner = THIS_MODULE;
> -#endif
> #endif
> }
>
> @@ -722,9 +714,6 @@ static void __exit
> dmapi_cleanup_procfs(void)
> {
> #ifdef CONFIG_PROC_FS
> -#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
> - remove_proc_entry( DMAPI_PROCFS, NULL);
> -#endif
> remove_proc_entry( DMAPI_DBG_PROCFS "/summary", NULL);
> remove_proc_entry( DMAPI_DBG_PROCFS "/fsreg", NULL);
> remove_proc_entry( DMAPI_DBG_PROCFS "/sessions", NULL);
---end quoted text---
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH] dmapi: kill last 2.4 compat leftovers
2007-12-21 6:37 ` Christoph Hellwig
@ 2008-01-07 4:41 ` Donald Douwsma
0 siblings, 0 replies; 3+ messages in thread
From: Donald Douwsma @ 2008-01-07 4:41 UTC (permalink / raw)
To: Christoph Hellwig; +Cc: xfs
Christoph Hellwig wrote:
> Any reason this didn't get in yet?
No its in now, thanks for the reminder.
Don
> On Fri, Nov 30, 2007 at 10:39:09AM +0100, Christoph Hellwig wrote:
>> Signed-off-by: Christoph Hellwig <hch@lst.de>
>>
>> Index: linux-2.6-xfs/fs/dmapi/dmapi_register.c
>> ===================================================================
>> --- linux-2.6-xfs.orig/fs/dmapi/dmapi_register.c 2007-09-29 11:49:22.000000000 +0200
>> +++ linux-2.6-xfs/fs/dmapi/dmapi_register.c 2007-09-29 11:49:39.000000000 +0200
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2008-01-07 4:41 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2007-11-30 9:39 [PATCH] dmapi: kill last 2.4 compat leftovers Christoph Hellwig
2007-12-21 6:37 ` Christoph Hellwig
2008-01-07 4:41 ` Donald Douwsma
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox