diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-01-14 12:07:11 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-01-14 12:07:11 -0500 |
| commit | 3441f0d26d02ec8073ea9ac7d1a4da8a9818ad59 (patch) | |
| tree | fb82a5ae8ec99df63ed13ea72d9eaf1d8ed0c0b7 /fs | |
| parent | f6a0e2ca7b1fe89da4e4b0afa6ba08dc34f1a0f7 (diff) | |
| parent | f1688e0431d3a395388e70fe21da89ed0de0c323 (diff) | |
Merge tag 'driver-core-3.8-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core
Pull driver core fixes from Greg Kroah-Hartman:
"Here are two patches for 3.8-rc3.
One removes the __dev* defines from init.h now that all usages of it
are gone from your tree. The other fix is for debugfs's paramater
that was using the wrong base for the option.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>"
* tag 'driver-core-3.8-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core:
debugfs: convert gid= argument from decimal, not octal
Remove __dev* markings from init.h
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/debugfs/inode.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/debugfs/inode.c b/fs/debugfs/inode.c index 153bb1e42e63..a5f12b7e228d 100644 --- a/fs/debugfs/inode.c +++ b/fs/debugfs/inode.c | |||
| @@ -176,7 +176,7 @@ static int debugfs_parse_options(char *data, struct debugfs_mount_opts *opts) | |||
| 176 | opts->uid = uid; | 176 | opts->uid = uid; |
| 177 | break; | 177 | break; |
| 178 | case Opt_gid: | 178 | case Opt_gid: |
| 179 | if (match_octal(&args[0], &option)) | 179 | if (match_int(&args[0], &option)) |
| 180 | return -EINVAL; | 180 | return -EINVAL; |
| 181 | gid = make_kgid(current_user_ns(), option); | 181 | gid = make_kgid(current_user_ns(), option); |
| 182 | if (!gid_valid(gid)) | 182 | if (!gid_valid(gid)) |