Skip to content

L
linux
Commit a0016ff2 authored by Fabian Frederick's avatar Fabian Frederick Committed by Linus Torvalds
Browse files
Options

fs/affs: use AFFS_MOUNT prefix for mount options 

Currently, affs still uses direct access on mount_options.  This patch
prepares to use affs_clear/set/test_opt() like other filesystems.
Signed-off-by: default avatarFabian Frederick <fabf@skynet.be>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent b7964106
Hide whitespace changes
Inline Side-by-side
Showing with 54 additions and 48 deletions
fs/affs/affs.h
View file @ a0016ff2
...@@ -106,18 +106,18 @@ struct affs_sb_info { ...@@ -106,18 +106,18 @@ struct affs_sb_info {
spinlock_t work_lock; /* protects sb_work and work_queued */ spinlock_t work_lock; /* protects sb_work and work_queued */
}; };
#define SF_INTL 0x0001 /* International filesystem. */ #define AFFS_MOUNT_SF_INTL 0x0001 /* International filesystem. */
#define SF_BM_VALID 0x0002 /* Bitmap is valid. */ #define AFFS_MOUNT_SF_BM_VALID 0x0002 /* Bitmap is valid. */
#define SF_IMMUTABLE 0x0004 /* Protection bits cannot be changed */ #define AFFS_MOUNT_SF_IMMUTABLE 0x0004 /* Protection bits cannot be changed */
#define SF_QUIET 0x0008 /* chmod errors will be not reported */ #define AFFS_MOUNT_SF_QUIET 0x0008 /* chmod errors will be not reported */
#define SF_SETUID 0x0010 /* Ignore Amiga uid */ #define AFFS_MOUNT_SF_SETUID 0x0010 /* Ignore Amiga uid */
#define SF_SETGID 0x0020 /* Ignore Amiga gid */ #define AFFS_MOUNT_SF_SETGID 0x0020 /* Ignore Amiga gid */
#define SF_SETMODE 0x0040 /* Ignore Amiga protection bits */ #define AFFS_MOUNT_SF_SETMODE 0x0040 /* Ignore Amiga protection bits */
#define SF_MUFS 0x0100 /* Use MUFS uid/gid mapping */ #define AFFS_MOUNT_SF_MUFS 0x0100 /* Use MUFS uid/gid mapping */
#define SF_OFS 0x0200 /* Old filesystem */ #define AFFS_MOUNT_SF_OFS 0x0200 /* Old filesystem */
#define SF_PREFIX 0x0400 /* Buffer for prefix is allocated */ #define AFFS_MOUNT_SF_PREFIX 0x0400 /* Buffer for prefix is allocated */
#define SF_VERBOSE 0x0800 /* Talk about fs when mounting */ #define AFFS_MOUNT_SF_VERBOSE 0x0800 /* Talk about fs when mounting */
#define SF_NO_TRUNCATE 0x1000 /* Don't truncate filenames */ #define AFFS_MOUNT_SF_NO_TRUNCATE 0x1000 /* Don't truncate filenames */
/* short cut to get to the affs specific sb data */ /* short cut to get to the affs specific sb data */
static inline struct affs_sb_info *AFFS_SB(struct super_block *sb) static inline struct affs_sb_info *AFFS_SB(struct super_block *sb)
......
fs/affs/amigaffs.c
View file @ a0016ff2
...@@ -472,7 +472,7 @@ bool ...@@ -472,7 +472,7 @@ bool
affs_nofilenametruncate(const struct dentry *dentry) affs_nofilenametruncate(const struct dentry *dentry)
{ {
struct inode *inode = dentry->d_inode; struct inode *inode = dentry->d_inode;
return AFFS_SB(inode->i_sb)->s_flags & SF_NO_TRUNCATE; return AFFS_SB(inode->i_sb)->s_flags & AFFS_MOUNT_SF_NO_TRUNCATE;
} }
......
fs/affs/file.c
View file @ a0016ff2
...@@ -915,7 +915,7 @@ affs_truncate(struct inode *inode) ...@@ -915,7 +915,7 @@ affs_truncate(struct inode *inode)
if (inode->i_size) { if (inode->i_size) {
AFFS_I(inode)->i_blkcnt = last_blk + 1; AFFS_I(inode)->i_blkcnt = last_blk + 1;
AFFS_I(inode)->i_extcnt = ext + 1; AFFS_I(inode)->i_extcnt = ext + 1;
if (AFFS_SB(sb)->s_flags & SF_OFS) { if (AFFS_SB(sb)->s_flags & AFFS_MOUNT_SF_OFS) {
struct buffer_head *bh = affs_bread_ino(inode, last_blk, 0); struct buffer_head *bh = affs_bread_ino(inode, last_blk, 0);
u32 tmp; u32 tmp;
if (IS_ERR(bh)) { if (IS_ERR(bh)) {
......
fs/affs/inode.c
View file @ a0016ff2
...@@ -66,23 +66,23 @@ struct inode *affs_iget(struct super_block *sb, unsigned long ino) ...@@ -66,23 +66,23 @@ struct inode *affs_iget(struct super_block *sb, unsigned long ino)
AFFS_I(inode)->i_lastalloc = 0; AFFS_I(inode)->i_lastalloc = 0;
AFFS_I(inode)->i_pa_cnt = 0; AFFS_I(inode)->i_pa_cnt = 0;
if (sbi->s_flags & SF_SETMODE) if (sbi->s_flags & AFFS_MOUNT_SF_SETMODE)
inode->i_mode = sbi->s_mode; inode->i_mode = sbi->s_mode;
else else
inode->i_mode = prot_to_mode(prot); inode->i_mode = prot_to_mode(prot);
id = be16_to_cpu(tail->uid); id = be16_to_cpu(tail->uid);
if (id == 0 || sbi->s_flags & SF_SETUID) if (id == 0 || sbi->s_flags & AFFS_MOUNT_SF_SETUID)
inode->i_uid = sbi->s_uid; inode->i_uid = sbi->s_uid;
else if (id == 0xFFFF && sbi->s_flags & SF_MUFS) else if (id == 0xFFFF && sbi->s_flags & AFFS_MOUNT_SF_MUFS)
i_uid_write(inode, 0); i_uid_write(inode, 0);
else else
i_uid_write(inode, id); i_uid_write(inode, id);
id = be16_to_cpu(tail->gid); id = be16_to_cpu(tail->gid);
if (id == 0 || sbi->s_flags & SF_SETGID) if (id == 0 || sbi->s_flags & AFFS_MOUNT_SF_SETGID)
inode->i_gid = sbi->s_gid; inode->i_gid = sbi->s_gid;
else if (id == 0xFFFF && sbi->s_flags & SF_MUFS) else if (id == 0xFFFF && sbi->s_flags & AFFS_MOUNT_SF_MUFS)
i_gid_write(inode, 0); i_gid_write(inode, 0);
else else
i_gid_write(inode, id); i_gid_write(inode, id);
...@@ -94,7 +94,7 @@ struct inode *affs_iget(struct super_block *sb, unsigned long ino) ...@@ -94,7 +94,7 @@ struct inode *affs_iget(struct super_block *sb, unsigned long ino)
/* fall through */ /* fall through */
case ST_USERDIR: case ST_USERDIR:
if (be32_to_cpu(tail->stype) == ST_USERDIR || if (be32_to_cpu(tail->stype) == ST_USERDIR ||
sbi->s_flags & SF_SETMODE) { sbi->s_flags & AFFS_MOUNT_SF_SETMODE) {
if (inode->i_mode & S_IRUSR) if (inode->i_mode & S_IRUSR)
inode->i_mode |= S_IXUSR; inode->i_mode |= S_IXUSR;
if (inode->i_mode & S_IRGRP) if (inode->i_mode & S_IRGRP)
...@@ -133,7 +133,8 @@ struct inode *affs_iget(struct super_block *sb, unsigned long ino) ...@@ -133,7 +133,8 @@ struct inode *affs_iget(struct super_block *sb, unsigned long ino)
} }
if (tail->link_chain) if (tail->link_chain)
set_nlink(inode, 2); set_nlink(inode, 2);
inode->i_mapping->a_ops = (sbi->s_flags & SF_OFS) ? &affs_aops_ofs : &affs_aops; inode->i_mapping->a_ops = (sbi->s_flags & AFFS_MOUNT_SF_OFS) ?
&affs_aops_ofs : &affs_aops;
inode->i_op = &affs_file_inode_operations; inode->i_op = &affs_file_inode_operations;
inode->i_fop = &affs_file_operations; inode->i_fop = &affs_file_operations;
break; break;
...@@ -190,15 +191,15 @@ affs_write_inode(struct inode *inode, struct writeback_control *wbc) ...@@ -190,15 +191,15 @@ affs_write_inode(struct inode *inode, struct writeback_control *wbc)
if (!(inode->i_ino == AFFS_SB(sb)->s_root_block)) { if (!(inode->i_ino == AFFS_SB(sb)->s_root_block)) {
uid = i_uid_read(inode); uid = i_uid_read(inode);
gid = i_gid_read(inode); gid = i_gid_read(inode);
if (AFFS_SB(sb)->s_flags & SF_MUFS) { if (AFFS_SB(sb)->s_flags & AFFS_MOUNT_SF_MUFS) {
if (uid == 0 || uid == 0xFFFF) if (uid == 0 || uid == 0xFFFF)
uid = uid ^ ~0; uid = uid ^ ~0;
if (gid == 0 || gid == 0xFFFF) if (gid == 0 || gid == 0xFFFF)
gid = gid ^ ~0; gid = gid ^ ~0;
} }
if (!(AFFS_SB(sb)->s_flags & SF_SETUID)) if (!(AFFS_SB(sb)->s_flags & AFFS_MOUNT_SF_SETUID))
tail->uid = cpu_to_be16(uid); tail->uid = cpu_to_be16(uid);
if (!(AFFS_SB(sb)->s_flags & SF_SETGID)) if (!(AFFS_SB(sb)->s_flags & AFFS_MOUNT_SF_SETGID))
tail->gid = cpu_to_be16(gid); tail->gid = cpu_to_be16(gid);
} }
} }
...@@ -221,11 +222,14 @@ affs_notify_change(struct dentry *dentry, struct iattr *attr) ...@@ -221,11 +222,14 @@ affs_notify_change(struct dentry *dentry, struct iattr *attr)
if (error) if (error)
goto out; goto out;
if (((attr->ia_valid & ATTR_UID) && (AFFS_SB(inode->i_sb)->s_flags & SF_SETUID)) || if (((attr->ia_valid & ATTR_UID) &&
((attr->ia_valid & ATTR_GID) && (AFFS_SB(inode->i_sb)->s_flags & SF_SETGID)) || (AFFS_SB(inode->i_sb)->s_flags & AFFS_MOUNT_SF_SETUID)) ||
((attr->ia_valid & ATTR_GID) &&
(AFFS_SB(inode->i_sb)->s_flags & AFFS_MOUNT_SF_SETGID)) ||
((attr->ia_valid & ATTR_MODE) && ((attr->ia_valid & ATTR_MODE) &&
(AFFS_SB(inode->i_sb)->s_flags & (SF_SETMODE | SF_IMMUTABLE)))) { (AFFS_SB(inode->i_sb)->s_flags &
if (!(AFFS_SB(inode->i_sb)->s_flags & SF_QUIET)) (AFFS_MOUNT_SF_SETMODE | AFFS_MOUNT_SF_IMMUTABLE)))) {
if (!(AFFS_SB(inode->i_sb)->s_flags & AFFS_MOUNT_SF_QUIET))
error = -EPERM; error = -EPERM;
goto out; goto out;
} }
......
fs/affs/namei.c
View file @ a0016ff2
...@@ -53,7 +53,8 @@ affs_intl_toupper(int ch) ...@@ -53,7 +53,8 @@ affs_intl_toupper(int ch)
static inline toupper_t static inline toupper_t
affs_get_toupper(struct super_block *sb) affs_get_toupper(struct super_block *sb)
{ {
return AFFS_SB(sb)->s_flags & SF_INTL ? affs_intl_toupper : affs_toupper; return AFFS_SB(sb)->s_flags & AFFS_MOUNT_SF_INTL ?
affs_intl_toupper : affs_toupper;
} }
/* /*
...@@ -275,7 +276,8 @@ affs_create(struct inode *dir, struct dentry *dentry, umode_t mode, bool excl) ...@@ -275,7 +276,8 @@ affs_create(struct inode *dir, struct dentry *dentry, umode_t mode, bool excl)
inode->i_op = &affs_file_inode_operations; inode->i_op = &affs_file_inode_operations;
inode->i_fop = &affs_file_operations; inode->i_fop = &affs_file_operations;
inode->i_mapping->a_ops = (AFFS_SB(sb)->s_flags & SF_OFS) ? &affs_aops_ofs : &affs_aops; inode->i_mapping->a_ops = (AFFS_SB(sb)->s_flags & AFFS_MOUNT_SF_OFS) ?
&affs_aops_ofs : &affs_aops;
error = affs_add_entry(dir, inode, dentry, ST_FILE); error = affs_add_entry(dir, inode, dentry, ST_FILE);
if (error) { if (error) {
clear_nlink(inode); clear_nlink(inode);
......
fs/affs/super.c
View file @ a0016ff2
...@@ -227,22 +227,22 @@ parse_options(char *options, kuid_t *uid, kgid_t *gid, int *mode, int *reserved, ...@@ -227,22 +227,22 @@ parse_options(char *options, kuid_t *uid, kgid_t *gid, int *mode, int *reserved,
if (match_octal(&args[0], &option)) if (match_octal(&args[0], &option))
return 0; return 0;
*mode = option & 0777; *mode = option & 0777;
*mount_opts |= SF_SETMODE; *mount_opts |= AFFS_MOUNT_SF_SETMODE;
break; break;
case Opt_mufs: case Opt_mufs:
*mount_opts |= SF_MUFS; *mount_opts |= AFFS_MOUNT_SF_MUFS;
break; break;
case Opt_notruncate: case Opt_notruncate:
*mount_opts |= SF_NO_TRUNCATE; *mount_opts |= AFFS_MOUNT_SF_NO_TRUNCATE;
break; break;
case Opt_prefix: case Opt_prefix:
*prefix = match_strdup(&args[0]); *prefix = match_strdup(&args[0]);
if (!*prefix) if (!*prefix)
return 0; return 0;
*mount_opts |= SF_PREFIX; *mount_opts |= AFFS_MOUNT_SF_PREFIX;
break; break;
case Opt_protect: case Opt_protect:
*mount_opts |= SF_IMMUTABLE; *mount_opts |= AFFS_MOUNT_SF_IMMUTABLE;
break; break;
case Opt_reserved: case Opt_reserved:
if (match_int(&args[0], reserved)) if (match_int(&args[0], reserved))
...@@ -258,7 +258,7 @@ parse_options(char *options, kuid_t *uid, kgid_t *gid, int *mode, int *reserved, ...@@ -258,7 +258,7 @@ parse_options(char *options, kuid_t *uid, kgid_t *gid, int *mode, int *reserved,
*gid = make_kgid(current_user_ns(), option); *gid = make_kgid(current_user_ns(), option);
if (!gid_valid(*gid)) if (!gid_valid(*gid))
return 0; return 0;
*mount_opts |= SF_SETGID; *mount_opts |= AFFS_MOUNT_SF_SETGID;
break; break;
case Opt_setuid: case Opt_setuid:
if (match_int(&args[0], &option)) if (match_int(&args[0], &option))
...@@ -266,10 +266,10 @@ parse_options(char *options, kuid_t *uid, kgid_t *gid, int *mode, int *reserved, ...@@ -266,10 +266,10 @@ parse_options(char *options, kuid_t *uid, kgid_t *gid, int *mode, int *reserved,
*uid = make_kuid(current_user_ns(), option); *uid = make_kuid(current_user_ns(), option);
if (!uid_valid(*uid)) if (!uid_valid(*uid))
return 0; return 0;
*mount_opts |= SF_SETUID; *mount_opts |= AFFS_MOUNT_SF_SETUID;
break; break;
case Opt_verbose: case Opt_verbose:
*mount_opts |= SF_VERBOSE; *mount_opts |= AFFS_MOUNT_SF_VERBOSE;
break; break;
case Opt_volume: { case Opt_volume: {
char *vol = match_strdup(&args[0]); char *vol = match_strdup(&args[0]);
...@@ -435,30 +435,30 @@ static int affs_fill_super(struct super_block *sb, void *data, int silent) ...@@ -435,30 +435,30 @@ static int affs_fill_super(struct super_block *sb, void *data, int silent)
case MUFS_FS: case MUFS_FS:
case MUFS_INTLFFS: case MUFS_INTLFFS:
case MUFS_DCFFS: case MUFS_DCFFS:
sbi->s_flags |= SF_MUFS; sbi->s_flags |= AFFS_MOUNT_SF_MUFS;
/* fall thru */ /* fall thru */
case FS_INTLFFS: case FS_INTLFFS:
case FS_DCFFS: case FS_DCFFS:
sbi->s_flags |= SF_INTL; sbi->s_flags |= AFFS_MOUNT_SF_INTL;
break; break;
case MUFS_FFS: case MUFS_FFS:
sbi->s_flags |= SF_MUFS; sbi->s_flags |= AFFS_MOUNT_SF_MUFS;
break; break;
case FS_FFS: case FS_FFS:
break; break;
case MUFS_OFS: case MUFS_OFS:
sbi->s_flags |= SF_MUFS; sbi->s_flags |= AFFS_MOUNT_SF_MUFS;
/* fall thru */ /* fall thru */
case FS_OFS: case FS_OFS:
sbi->s_flags |= SF_OFS; sbi->s_flags |= AFFS_MOUNT_SF_OFS;
sb->s_flags |= MS_NOEXEC; sb->s_flags |= MS_NOEXEC;
break; break;
case MUFS_DCOFS: case MUFS_DCOFS:
case MUFS_INTLOFS: case MUFS_INTLOFS:
sbi->s_flags |= SF_MUFS; sbi->s_flags |= AFFS_MOUNT_SF_MUFS;
case FS_DCOFS: case FS_DCOFS:
case FS_INTLOFS: case FS_INTLOFS:
sbi->s_flags |= SF_INTL | SF_OFS; sbi->s_flags |= AFFS_MOUNT_SF_INTL | AFFS_MOUNT_SF_OFS;
sb->s_flags |= MS_NOEXEC; sb->s_flags |= MS_NOEXEC;
break; break;
default: default:
...@@ -467,7 +467,7 @@ static int affs_fill_super(struct super_block *sb, void *data, int silent) ...@@ -467,7 +467,7 @@ static int affs_fill_super(struct super_block *sb, void *data, int silent)
return -EINVAL; return -EINVAL;
} }
if (mount_flags & SF_VERBOSE) { if (mount_flags & AFFS_MOUNT_SF_VERBOSE) {
u8 len = AFFS_ROOT_TAIL(sb, root_bh)->disk_name[0]; u8 len = AFFS_ROOT_TAIL(sb, root_bh)->disk_name[0];
pr_notice("Mounting volume \"%.*s\": Type=%.3s\\%c, Blocksize=%d\n", pr_notice("Mounting volume \"%.*s\": Type=%.3s\\%c, Blocksize=%d\n",
len > 31 ? 31 : len, len > 31 ? 31 : len,
...@@ -478,7 +478,7 @@ static int affs_fill_super(struct super_block *sb, void *data, int silent) ...@@ -478,7 +478,7 @@ static int affs_fill_super(struct super_block *sb, void *data, int silent)
sb->s_flags |= MS_NODEV | MS_NOSUID; sb->s_flags |= MS_NODEV | MS_NOSUID;
sbi->s_data_blksize = sb->s_blocksize; sbi->s_data_blksize = sb->s_blocksize;
if (sbi->s_flags & SF_OFS) if (sbi->s_flags & AFFS_MOUNT_SF_OFS)
sbi->s_data_blksize -= 24; sbi->s_data_blksize -= 24;
tmp_flags = sb->s_flags; tmp_flags = sb->s_flags;
...@@ -493,7 +493,7 @@ static int affs_fill_super(struct super_block *sb, void *data, int silent) ...@@ -493,7 +493,7 @@ static int affs_fill_super(struct super_block *sb, void *data, int silent)
if (IS_ERR(root_inode)) if (IS_ERR(root_inode))
return PTR_ERR(root_inode); return PTR_ERR(root_inode);
if (AFFS_SB(sb)->s_flags & SF_INTL) if (AFFS_SB(sb)->s_flags & AFFS_MOUNT_SF_INTL)
sb->s_d_op = &affs_intl_dentry_operations; sb->s_d_op = &affs_intl_dentry_operations;
else else
sb->s_d_op = &affs_dentry_operations; sb->s_d_op = &affs_dentry_operations;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7