Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 154122
b: refs/heads/master
c: c63e09e
h: refs/heads/master
v: v3
  • Loading branch information
Al Viro committed Jun 24, 2009
1 parent 5e17639 commit 3c01285
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 2 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 7e325d3a6b117c7288bfc0755410e9d9d2b71326
refs/heads/master: c63e09ecccb50f930e899d7005edc5411ee86d4f
7 changes: 6 additions & 1 deletion trunk/fs/super.c
Original file line number Diff line number Diff line change
Expand Up @@ -608,6 +608,7 @@ void emergency_remount(void)

static DEFINE_IDA(unnamed_dev_ida);
static DEFINE_SPINLOCK(unnamed_dev_lock);/* protects the above */
static int unnamed_dev_start = 0; /* don't bother trying below it */

int set_anon_super(struct super_block *s, void *data)
{
Expand All @@ -618,7 +619,8 @@ int set_anon_super(struct super_block *s, void *data)
if (ida_pre_get(&unnamed_dev_ida, GFP_ATOMIC) == 0)
return -ENOMEM;
spin_lock(&unnamed_dev_lock);
error = ida_get_new(&unnamed_dev_ida, &dev);
error = ida_get_new_above(&unnamed_dev_ida, unnamed_dev_start, &dev);
unnamed_dev_start = dev + 1;
spin_unlock(&unnamed_dev_lock);
if (error == -EAGAIN)
/* We raced and lost with another CPU. */
Expand All @@ -629,6 +631,7 @@ int set_anon_super(struct super_block *s, void *data)
if ((dev & MAX_ID_MASK) == (1 << MINORBITS)) {
spin_lock(&unnamed_dev_lock);
ida_remove(&unnamed_dev_ida, dev);
unnamed_dev_start = dev;
spin_unlock(&unnamed_dev_lock);
return -EMFILE;
}
Expand All @@ -645,6 +648,8 @@ void kill_anon_super(struct super_block *sb)
generic_shutdown_super(sb);
spin_lock(&unnamed_dev_lock);
ida_remove(&unnamed_dev_ida, slot);
if (slot < unnamed_dev_start)
unnamed_dev_start = slot;
spin_unlock(&unnamed_dev_lock);
}

Expand Down

0 comments on commit 3c01285

Please sign in to comment.