Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 213053
b: refs/heads/master
c: 6d0aed7
h: refs/heads/master
i:
  213051: 471c905
v: v3
  • Loading branch information
Jens Axboe committed Sep 17, 2010
1 parent aa07685 commit 90ffc57
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 1 deletion.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 01ea50638bc04ca5259f5711fcdedefcdde1cf43
refs/heads/master: 6d0aed7a38d06284db2a0e46c0a072b0c1c3299b
4 changes: 4 additions & 0 deletions trunk/init/do_mounts.c
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@ static int __init readwrite(char *str)
__setup("ro", readonly);
__setup("rw", readwrite);

#ifdef CONFIG_BLOCK
/**
* match_dev_by_uuid - callback for finding a partition using its uuid
* @dev: device passed in by the caller
Expand Down Expand Up @@ -111,6 +112,7 @@ static dev_t __init devt_from_partuuid(char *uuid_str)
done:
return res;
}
#endif

/*
* Convert a name into device number. We accept the following variants:
Expand Down Expand Up @@ -138,6 +140,7 @@ dev_t name_to_dev_t(char *name)
dev_t res = 0;
int part;

#ifdef CONFIG_BLOCK
if (strncmp(name, "PARTUUID=", 9) == 0) {
name += 9;
if (strlen(name) != 36)
Expand All @@ -147,6 +150,7 @@ dev_t name_to_dev_t(char *name)
goto fail;
goto done;
}
#endif

if (strncmp(name, "/dev/", 5) != 0) {
unsigned maj, min;
Expand Down

0 comments on commit 90ffc57

Please sign in to comment.