public inbox for linux-xfs@vger.kernel.org
 help / color / mirror / Atom feed
From: Christoph Hellwig <hch@lst.de>
To: xfs@oss.sgi.com
Subject: [PATCH] dmapi: kill last 2.4 compat leftovers
Date: Fri, 30 Nov 2007 10:39:09 +0100	[thread overview]
Message-ID: <20071130093909.GB2949@lst.de> (raw)

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);

             reply	other threads:[~2007-11-30  9:39 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2007-11-30  9:39 Christoph Hellwig [this message]
2007-12-21  6:37 ` [PATCH] dmapi: kill last 2.4 compat leftovers Christoph Hellwig
2008-01-07  4:41   ` Donald Douwsma

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20071130093909.GB2949@lst.de \
    --to=hch@lst.de \
    --cc=xfs@oss.sgi.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox