diff options
| author | Martin Brandenburg <martin@omnibond.com> | 2016-09-28 14:50:46 -0400 |
|---|---|---|
| committer | Martin Brandenburg <martin@omnibond.com> | 2016-09-28 14:50:46 -0400 |
| commit | b78b11985a36bfe768add17ffb70bbaf9d8d7627 (patch) | |
| tree | 20915bb2586b22567d408c753bba346f131fa759 /fs/orangefs/super.c | |
| parent | f808e138c0abd99bfce90ec8d4ef6406c2af714a (diff) | |
| parent | 1d503617884ed43af1c03685e73ce23f155d3fa4 (diff) | |
Merge branch 'misc' into for-next
Pull in an OrangeFS branch containing miscellaneous improvements.
- clean up debugfs globals
- remove dead code in sysfs
- reorganize duplicated sysfs attribute structs
- consolidate sysfs show and store functions
- remove duplicated sysfs_ops structures
- describe organization of sysfs
- make devreq_mutex static
- g_orangefs_stats -> orangefs_stats for consistency
- rename most remaining global variables
Diffstat (limited to 'fs/orangefs/super.c')
| -rw-r--r-- | fs/orangefs/super.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/orangefs/super.c b/fs/orangefs/super.c index b4ab1c1e8278..166f3a59d2e4 100644 --- a/fs/orangefs/super.c +++ b/fs/orangefs/super.c @@ -557,8 +557,8 @@ void orangefs_kill_sb(struct super_block *sb) * make sure that ORANGEFS_DEV_REMOUNT_ALL loop that might've seen us * gets completed before we free the dang thing. */ - mutex_lock(&request_mutex); - mutex_unlock(&request_mutex); + mutex_lock(&orangefs_request_mutex); + mutex_unlock(&orangefs_request_mutex); /* free the orangefs superblock private data */ kfree(ORANGEFS_SB(sb)); |