CINXE.COM

<?xml version="1.0" encoding="UTF-8" standalone="yes"?> <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"><html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /><title>LKML: David Howells: [PATCH 6/12]: MUTEX: Rename DECLARE_MUTEX for fs/ dir</title><link href="/css/message.css" rel="stylesheet" type="text/css" /><link href="/css/wrap.css" rel="alternate stylesheet" type="text/css" title="wrap" /><link href="/css/nowrap.css" rel="stylesheet" type="text/css" title="nowrap" /><link href="/favicon.ico" rel="shortcut icon" /><script src="/js/simple-calendar.js" type="text/javascript"></script><script src="/js/styleswitcher.js" type="text/javascript"></script><link rel="alternate" type="application/rss+xml" title="lkml.org : last 100 messages" href="/rss.php" /><link rel="alternate" type="application/rss+xml" title="lkml.org : last messages by David Howells" href="/groupie.php?aid=345" /><script> var _paq = window._paq = window._paq || []; /* tracker methods like "setCustomDimension" should be called before "trackPageView" */ _paq.push(["setDoNotTrack", true]); _paq.push(["disableCookies"]); _paq.push(['trackPageView']); _paq.push(['enableLinkTracking']); (function() { var u="//m.lkml.org/"; _paq.push(['setTrackerUrl', u+'matomo.php']); _paq.push(['setSiteId', '1']); var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0]; g.async=true; g.src=u+'matomo.js'; s.parentNode.insertBefore(g,s); })(); </script></head><body onload="es.jasper.simpleCalendar.init();" itemscope="itemscope" itemtype="http://schema.org/BlogPosting"><table border="0" cellpadding="0" cellspacing="0"><tr><td width="180" align="center"><a href="/"><img style="border:0;width:135px;height:32px" src="/images/toprowlk.gif" alt="lkml.org" /></a></td><td width="32">聽</td><td class="nb"><div><a class="nb" href="/lkml"> [lkml]</a> 聽 <a class="nb" href="/lkml/2005"> [2005]</a> 聽 <a class="nb" href="/lkml/2005/12"> [Dec]</a> 聽 <a class="nb" href="/lkml/2005/12/16"> [16]</a> 聽 <a class="nb" href="/lkml/last100"> [last100]</a> 聽 <a href="/rss.php"><img src="/images/rss-or.gif" border="0" alt="RSS Feed" /></a></div><div>Views: <a href="#" class="nowrap" onclick="setActiveStyleSheet('wrap');return false;">[wrap]</a><a href="#" class="wrap" onclick="setActiveStyleSheet('nowrap');return false;">[no wrap]</a> 聽 <a class="nb" href="/lkml/mheaders/2005/12/16/279" onclick="this.href='/lkml/headers'+'/2005/12/16/279';">[headers]</a>聽 <a href="/lkml/bounce/2005/12/16/279">[forward]</a>聽 </div></td><td width="32">聽</td></tr><tr><td valign="top"><div class="es-jasper-simpleCalendar" baseurl="/lkml/"></div><div class="threadlist">Messages in this thread</div><ul class="threadlist"><li class="root"><a href="/lkml/2005/12/16/277">First message in thread</a></li><li><a href="/lkml/2005/12/16/277">David Howells</a><ul><li><a href="/lkml/2005/12/16/270">David Howells</a></li><li><a href="/lkml/2005/12/16/271">David Howells</a></li><li><a href="/lkml/2005/12/16/272">David Howells</a></li><li><a href="/lkml/2005/12/16/273">David Howells</a></li><li><a href="/lkml/2005/12/16/274">David Howells</a></li><li><a href="/lkml/2005/12/16/275">David Howells</a></li><li><a href="/lkml/2005/12/16/276">David Howells</a></li><li><a href="/lkml/2005/12/16/278">David Howells</a></li><li class="origin"><a href="">David Howells</a></li><li><a href="/lkml/2005/12/16/280">David Howells</a></li><li><a href="/lkml/2005/12/16/281">David Howells</a></li><li><a href="/lkml/2005/12/16/282">David Howells</a></li><li><a href="/lkml/2005/12/16/335">Steven Rostedt</a><ul><li><a href="/lkml/2005/12/17/13">Linus Torvalds</a><ul><li><a href="/lkml/2005/12/17/60">David Howells</a><ul><li><a href="/lkml/2005/12/17/63">Linus Torvalds</a></li></ul></li></ul></li><li><a href="/lkml/2005/12/17/15">Nick Piggin</a><ul><li><a href="/lkml/2005/12/17/24">Steven Rostedt</a></li></ul></li></ul></li></ul></li></ul><div class="threadlist">Patch in this message</div><ul class="threadlist"><li><a href="/lkml/diff/2005/12/16/279/1">Get diff 1</a></li></ul></td><td width="32" rowspan="2" class="c" valign="top"><img src="/images/icornerl.gif" width="32" height="32" alt="/" /></td><td class="c" rowspan="2" valign="top" style="padding-top: 1em"><table><tr><td><table><tr><td class="lp">Date</td><td class="rp" itemprop="datePublished">Fri, 16 Dec 2005 23:13:08 GMT</td></tr><tr><td class="lp">From</td><td class="rp" itemprop="author">David Howells <></td></tr><tr><td class="lp">Subject</td><td class="rp" itemprop="name">[PATCH 6/12]: MUTEX: Rename DECLARE_MUTEX for fs/ dir</td></tr></table></td><td></td></tr></table><pre itemprop="articleBody">The attached patch renames DECLARE_MUTEX*() to DECLARE_SEM_MUTEX*() for the fs/ directory. Signed-Off-By: David Howells <dhowells@redhat.com> --- warthog>diffstat -p1 mutex-fs-2615rc5-2.diff fs/char_dev.c | 2 +- fs/cramfs/inode.c | 2 +- fs/dcookies.c | 2 +- fs/inode.c | 2 +- fs/jffs2/compr_zlib.c | 4 ++-- fs/jfs/jfs_logmgr.c | 2 +- fs/lockd/host.c | 2 +- fs/lockd/svc.c | 4 ++-- fs/lockd/svcsubs.c | 2 +- fs/nfs/callback.c | 2 +- fs/nfsd/nfs4state.c | 2 +- fs/ntfs/super.c | 2 +- fs/partitions/devfs.c | 2 +- fs/super.c | 2 +- 14 files changed, 16 insertions(+), 16 deletions(-) diff -uNrp linux-2.6.15-rc5/fs/char_dev.c linux-2.6.15-rc5-mutex/fs/char_dev.c --- linux-2.6.15-rc5/fs/char_dev.c 2005-08-30 13:56:28.000000000 +0100 +++ linux-2.6.15-rc5-mutex/fs/char_dev.c 2005-12-15 17:14:57.000000000 +0000 @@ -28,7 +28,7 @@ static struct kobj_map *cdev_map; #define MAX_PROBE_HASH 255 /* random */ -static DECLARE_MUTEX(chrdevs_lock); +static DECLARE_SEM_MUTEX(chrdevs_lock); static struct char_device_struct { struct char_device_struct *next; diff -uNrp linux-2.6.15-rc5/fs/cramfs/inode.c linux-2.6.15-rc5-mutex/fs/cramfs/inode.c --- linux-2.6.15-rc5/fs/cramfs/inode.c 2005-11-01 13:19:14.000000000 +0000 +++ linux-2.6.15-rc5-mutex/fs/cramfs/inode.c 2005-12-15 17:14:57.000000000 +0000 @@ -31,7 +31,7 @@ static struct inode_operations cramfs_di static struct file_operations cramfs_directory_operations; static struct address_space_operations cramfs_aops; -static DECLARE_MUTEX(read_mutex); +static DECLARE_SEM_MUTEX(read_mutex); /* These two macros may change in future, to provide better st_ino diff -uNrp linux-2.6.15-rc5/fs/dcookies.c linux-2.6.15-rc5-mutex/fs/dcookies.c --- linux-2.6.15-rc5/fs/dcookies.c 2005-08-30 13:56:28.000000000 +0100 +++ linux-2.6.15-rc5-mutex/fs/dcookies.c 2005-12-15 17:14:57.000000000 +0000 @@ -35,7 +35,7 @@ struct dcookie_struct { }; static LIST_HEAD(dcookie_users); -static DECLARE_MUTEX(dcookie_sem); +static DECLARE_SEM_MUTEX(dcookie_sem); static kmem_cache_t * dcookie_cache; static struct list_head * dcookie_hashtable; static size_t hash_size; diff -uNrp linux-2.6.15-rc5/fs/inode.c linux-2.6.15-rc5-mutex/fs/inode.c --- linux-2.6.15-rc5/fs/inode.c 2005-12-08 16:23:49.000000000 +0000 +++ linux-2.6.15-rc5-mutex/fs/inode.c 2005-12-15 17:14:57.000000000 +0000 @@ -90,7 +90,7 @@ DEFINE_SPINLOCK(inode_lock); * from its final dispose_list, the struct super_block they refer to * (for inode->i_sb->s_op) may already have been freed and reused. */ -DECLARE_MUTEX(iprune_sem); +DECLARE_SEM_MUTEX(iprune_sem); /* * Statistics gathering.. diff -uNrp linux-2.6.15-rc5/fs/jffs2/compr_zlib.c linux-2.6.15-rc5-mutex/fs/jffs2/compr_zlib.c --- linux-2.6.15-rc5/fs/jffs2/compr_zlib.c 2005-12-08 16:23:50.000000000 +0000 +++ linux-2.6.15-rc5-mutex/fs/jffs2/compr_zlib.c 2005-12-15 17:14:57.000000000 +0000 @@ -33,8 +33,8 @@ */ #define STREAM_END_SPACE 12 -static DECLARE_MUTEX(deflate_sem); -static DECLARE_MUTEX(inflate_sem); +static DECLARE_SEM_MUTEX(deflate_sem); +static DECLARE_SEM_MUTEX(inflate_sem); static z_stream inf_strm, def_strm; #ifdef __KERNEL__ /* Linux-only */ diff -uNrp linux-2.6.15-rc5/fs/jfs/jfs_logmgr.c linux-2.6.15-rc5-mutex/fs/jfs/jfs_logmgr.c --- linux-2.6.15-rc5/fs/jfs/jfs_logmgr.c 2005-08-30 13:56:28.000000000 +0100 +++ linux-2.6.15-rc5-mutex/fs/jfs/jfs_logmgr.c 2005-12-15 17:14:57.000000000 +0000 @@ -165,7 +165,7 @@ do { \ */ static LIST_HEAD(jfs_external_logs); static struct jfs_log *dummy_log = NULL; -static DECLARE_MUTEX(jfs_log_sem); +static DECLARE_SEM_MUTEX(jfs_log_sem); /* * forward references diff -uNrp linux-2.6.15-rc5/fs/lockd/host.c linux-2.6.15-rc5-mutex/fs/lockd/host.c --- linux-2.6.15-rc5/fs/lockd/host.c 2005-12-08 16:23:50.000000000 +0000 +++ linux-2.6.15-rc5-mutex/fs/lockd/host.c 2005-12-15 17:14:57.000000000 +0000 @@ -30,7 +30,7 @@ static struct nlm_host * nlm_hosts[NLM_HOST_NRHASH]; static unsigned long next_gc; static int nrhosts; -static DECLARE_MUTEX(nlm_host_sema); +static DECLARE_SEM_MUTEX(nlm_host_sema); static void nlm_gc_hosts(void); diff -uNrp linux-2.6.15-rc5/fs/lockd/svc.c linux-2.6.15-rc5-mutex/fs/lockd/svc.c --- linux-2.6.15-rc5/fs/lockd/svc.c 2005-08-30 13:56:28.000000000 +0100 +++ linux-2.6.15-rc5-mutex/fs/lockd/svc.c 2005-12-15 17:14:57.000000000 +0000 @@ -43,13 +43,13 @@ static struct svc_program nlmsvc_program struct nlmsvc_binding * nlmsvc_ops; EXPORT_SYMBOL(nlmsvc_ops); -static DECLARE_MUTEX(nlmsvc_sema); +static DECLARE_SEM_MUTEX(nlmsvc_sema); static unsigned int nlmsvc_users; static pid_t nlmsvc_pid; int nlmsvc_grace_period; unsigned long nlmsvc_timeout; -static DECLARE_MUTEX_LOCKED(lockd_start); +static DECLARE_SEM_MUTEX_LOCKED(lockd_start); static DECLARE_WAIT_QUEUE_HEAD(lockd_exit); /* diff -uNrp linux-2.6.15-rc5/fs/lockd/svcsubs.c linux-2.6.15-rc5-mutex/fs/lockd/svcsubs.c --- linux-2.6.15-rc5/fs/lockd/svcsubs.c 2005-12-08 16:23:50.000000000 +0000 +++ linux-2.6.15-rc5-mutex/fs/lockd/svcsubs.c 2005-12-15 17:14:57.000000000 +0000 @@ -28,7 +28,7 @@ #define FILE_HASH_BITS 5 #define FILE_NRHASH (1<<FILE_HASH_BITS) static struct nlm_file * nlm_files[FILE_NRHASH]; -static DECLARE_MUTEX(nlm_file_sema); +static DECLARE_SEM_MUTEX(nlm_file_sema); #ifdef NFSD_DEBUG static inline void nlm_debug_print_fh(char *msg, struct nfs_fh *f) diff -uNrp linux-2.6.15-rc5/fs/nfs/callback.c linux-2.6.15-rc5-mutex/fs/nfs/callback.c --- linux-2.6.15-rc5/fs/nfs/callback.c 2005-08-30 13:56:28.000000000 +0100 +++ linux-2.6.15-rc5-mutex/fs/nfs/callback.c 2005-12-15 17:14:57.000000000 +0000 @@ -28,7 +28,7 @@ struct nfs_callback_data { }; static struct nfs_callback_data nfs_callback_info; -static DECLARE_MUTEX(nfs_callback_sema); +static DECLARE_SEM_MUTEX(nfs_callback_sema); static struct svc_program nfs4_callback_program; unsigned short nfs_callback_tcpport; diff -uNrp linux-2.6.15-rc5/fs/nfsd/nfs4state.c linux-2.6.15-rc5-mutex/fs/nfsd/nfs4state.c --- linux-2.6.15-rc5/fs/nfsd/nfs4state.c 2005-11-01 13:19:15.000000000 +0000 +++ linux-2.6.15-rc5-mutex/fs/nfsd/nfs4state.c 2005-12-15 17:14:57.000000000 +0000 @@ -81,7 +81,7 @@ static void nfs4_set_recdir(char *recdir * protects clientid_hashtbl[], clientstr_hashtbl[], * unconfstr_hashtbl[], uncofid_hashtbl[]. */ -static DECLARE_MUTEX(client_sema); +static DECLARE_SEM_MUTEX(client_sema); static kmem_cache_t *stateowner_slab = NULL; static kmem_cache_t *file_slab = NULL; diff -uNrp linux-2.6.15-rc5/fs/ntfs/super.c linux-2.6.15-rc5-mutex/fs/ntfs/super.c --- linux-2.6.15-rc5/fs/ntfs/super.c 2005-12-08 16:23:50.000000000 +0000 +++ linux-2.6.15-rc5-mutex/fs/ntfs/super.c 2005-12-15 17:14:57.000000000 +0000 @@ -3012,7 +3012,7 @@ kmem_cache_t *ntfs_attr_ctx_cache; kmem_cache_t *ntfs_index_ctx_cache; /* Driver wide semaphore. */ -DECLARE_MUTEX(ntfs_lock); +DECLARE_SEM_MUTEX(ntfs_lock); static struct super_block *ntfs_get_sb(struct file_system_type *fs_type, int flags, const char *dev_name, void *data) diff -uNrp linux-2.6.15-rc5/fs/partitions/devfs.c linux-2.6.15-rc5-mutex/fs/partitions/devfs.c --- linux-2.6.15-rc5/fs/partitions/devfs.c 2005-01-04 11:13:41.000000000 +0000 +++ linux-2.6.15-rc5-mutex/fs/partitions/devfs.c 2005-12-15 17:14:57.000000000 +0000 @@ -16,7 +16,7 @@ struct unique_numspace { struct semaphore mutex; }; -static DECLARE_MUTEX(numspace_mutex); +static DECLARE_SEM_MUTEX(numspace_mutex); static int expand_numspace(struct unique_numspace *s) { diff -uNrp linux-2.6.15-rc5/fs/super.c linux-2.6.15-rc5-mutex/fs/super.c --- linux-2.6.15-rc5/fs/super.c 2005-12-08 16:23:50.000000000 +0000 +++ linux-2.6.15-rc5-mutex/fs/super.c 2005-12-15 17:14:57.000000000 +0000 @@ -380,7 +380,7 @@ restart: void sync_filesystems(int wait) { struct super_block *sb; - static DECLARE_MUTEX(mutex); + static DECLARE_SEM_MUTEX(mutex); down(&mutex); /* Could be down_interruptible */ spin_lock(&sb_lock); - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at <a href="http://vger.kernel.org/majordomo-info.html">http://vger.kernel.org/majordomo-info.html</a> Please read the FAQ at <a href="http://www.tux.org/lkml/">http://www.tux.org/lkml/</a> </pre></td><td width="32" rowspan="2" class="c" valign="top"><img src="/images/icornerr.gif" width="32" height="32" alt="\" /></td></tr><tr><td align="right" valign="bottom"> 聽 </td></tr><tr><td align="right" valign="bottom">聽</td><td class="c" valign="bottom" style="padding-bottom: 0px"><img src="/images/bcornerl.gif" width="32" height="32" alt="\" /></td><td class="c">聽</td><td class="c" valign="bottom" style="padding-bottom: 0px"><img src="/images/bcornerr.gif" width="32" height="32" alt="/" /></td></tr><tr><td align="right" valign="top" colspan="2"> 聽 </td><td class="lm">Last update: 2005-12-17 00:20 聽聽 [from the cache] 漏2003-2020 <a href="http://blog.jasper.es/">Jasper Spaans</a>|hosted at <a href="https://www.digitalocean.com/?refcode=9a8e99d24cf9">Digital Ocean</a> and my Meterkast|<a href="http://blog.jasper.es/categories.html#lkml-ref">Read the blog</a></td><td>聽</td></tr></table><script language="javascript" src="/js/styleswitcher.js" type="text/javascript"></script></body></html>