mirror of
https://github.com/torvalds/linux.git
synced 2024-11-21 19:41:42 +00:00
udf: convert novrs to an option flag
There's no reason to treat novers specially, convert it to a flag in uopt->flags like other flag options. Signed-off-by: Eric Sandeen <sandeen@redhat.com> Signed-off-by: Jan Kara <jack@suse.cz> Message-Id: <b5d53492-b99a-4b3c-82c0-581df9a9e384@redhat.com>
This commit is contained in:
parent
d27f41eed5
commit
7a8e72c16e
@ -209,7 +209,6 @@ static const struct super_operations udf_sb_ops = {
|
||||
};
|
||||
|
||||
struct udf_options {
|
||||
unsigned char novrs;
|
||||
unsigned int blocksize;
|
||||
unsigned int session;
|
||||
unsigned int lastblock;
|
||||
@ -461,7 +460,6 @@ static int udf_parse_options(char *options, struct udf_options *uopt,
|
||||
int option;
|
||||
unsigned int uv;
|
||||
|
||||
uopt->novrs = 0;
|
||||
uopt->session = 0xFFFFFFFF;
|
||||
uopt->lastblock = 0;
|
||||
uopt->anchor = 0;
|
||||
@ -479,7 +477,7 @@ static int udf_parse_options(char *options, struct udf_options *uopt,
|
||||
token = match_token(p, tokens, args);
|
||||
switch (token) {
|
||||
case Opt_novrs:
|
||||
uopt->novrs = 1;
|
||||
uopt->flags |= (1 << UDF_FLAG_NOVRS);
|
||||
break;
|
||||
case Opt_bs:
|
||||
if (match_int(&args[0], &option))
|
||||
@ -1954,7 +1952,7 @@ static int udf_load_vrs(struct super_block *sb, struct udf_options *uopt,
|
||||
return -EINVAL;
|
||||
}
|
||||
sbi->s_last_block = uopt->lastblock;
|
||||
if (!uopt->novrs) {
|
||||
if (!UDF_QUERY_FLAG(sb, UDF_FLAG_NOVRS)) {
|
||||
/* Check that it is NSR02 compliant */
|
||||
nsr = udf_check_vsd(sb);
|
||||
if (!nsr) {
|
||||
|
@ -23,6 +23,7 @@
|
||||
#define UDF_FLAG_STRICT 5
|
||||
#define UDF_FLAG_UNDELETE 6
|
||||
#define UDF_FLAG_UNHIDE 7
|
||||
#define UDF_FLAG_NOVRS 8
|
||||
#define UDF_FLAG_UID_FORGET 11 /* save -1 for uid to disk */
|
||||
#define UDF_FLAG_GID_FORGET 12
|
||||
#define UDF_FLAG_UID_SET 13
|
||||
|
Loading…
Reference in New Issue
Block a user