1 files changed, 18 insertions, 18 deletions

diff --git a/fs/affs/super.c b/fs/affs/super.c
index 4cf0e9113fb6..5623b494bdf5 100644
--- a/fs/affs/super.c
+++ b/fs/affs/super.c
@@ -227,22 +227,22 @@ parse_options(char *options, kuid_t *uid, kgid_t *gid, int *mode, int *reserved,
 			if (match_octal(&args[0], &option))
 				return 0;
 			*mode = option & 0777;
-			*mount_opts |= SF_SETMODE;
+			*mount_opts |= AFFS_MOUNT_SF_SETMODE;
 			break;
 		case Opt_mufs:
-			*mount_opts |= SF_MUFS;
+			*mount_opts |= AFFS_MOUNT_SF_MUFS;
 			break;
 		case Opt_notruncate:
-			*mount_opts |= SF_NO_TRUNCATE;
+			*mount_opts |= AFFS_MOUNT_SF_NO_TRUNCATE;
 			break;
 		case Opt_prefix:
 			*prefix = match_strdup(&args[0]);
 			if (!*prefix)
 				return 0;
-			*mount_opts |= SF_PREFIX;
+			*mount_opts |= AFFS_MOUNT_SF_PREFIX;
 			break;
 		case Opt_protect:
-			*mount_opts |= SF_IMMUTABLE;
+			*mount_opts |= AFFS_MOUNT_SF_IMMUTABLE;
 			break;
 		case Opt_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,
 			*gid = make_kgid(current_user_ns(), option);
 			if (!gid_valid(*gid))
 				return 0;
-			*mount_opts |= SF_SETGID;
+			*mount_opts |= AFFS_MOUNT_SF_SETGID;
 			break;
 		case Opt_setuid:
 			if (match_int(&args[0], &option))
@@ -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);
 			if (!uid_valid(*uid))
 				return 0;
-			*mount_opts |= SF_SETUID;
+			*mount_opts |= AFFS_MOUNT_SF_SETUID;
 			break;
 		case Opt_verbose:
-			*mount_opts |= SF_VERBOSE;
+			*mount_opts |= AFFS_MOUNT_SF_VERBOSE;
 			break;
 		case Opt_volume: {
 			char *vol = match_strdup(&args[0]);
@@ -435,30 +435,30 @@ got_root:
 	case MUFS_FS:
 	case MUFS_INTLFFS:
 	case MUFS_DCFFS:
-		sbi->s_flags |= SF_MUFS;
+		sbi->s_flags |= AFFS_MOUNT_SF_MUFS;
 		/* fall thru */
 	case FS_INTLFFS:
 	case FS_DCFFS:
-		sbi->s_flags |= SF_INTL;
+		sbi->s_flags |= AFFS_MOUNT_SF_INTL;
 		break;
 	case MUFS_FFS:
-		sbi->s_flags |= SF_MUFS;
+		sbi->s_flags |= AFFS_MOUNT_SF_MUFS;
 		break;
 	case FS_FFS:
 		break;
 	case MUFS_OFS:
-		sbi->s_flags |= SF_MUFS;
+		sbi->s_flags |= AFFS_MOUNT_SF_MUFS;
 		/* fall thru */
 	case FS_OFS:
-		sbi->s_flags |= SF_OFS;
+		sbi->s_flags |= AFFS_MOUNT_SF_OFS;
 		sb->s_flags |= MS_NOEXEC;
 		break;
 	case MUFS_DCOFS:
 	case MUFS_INTLOFS:
-		sbi->s_flags |= SF_MUFS;
+		sbi->s_flags |= AFFS_MOUNT_SF_MUFS;
 	case FS_DCOFS:
 	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;
 		break;
 	default:
@@ -467,7 +467,7 @@ got_root:
 		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];
 		pr_notice("Mounting volume \"%.*s\": Type=%.3s\\%c, Blocksize=%d\n",
 			len > 31 ? 31 : len,
@@ -478,7 +478,7 @@ got_root:
 	sb->s_flags |= MS_NODEV | MS_NOSUID;
 
 	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;
 
 	tmp_flags = sb->s_flags;
@@ -493,7 +493,7 @@ got_root:
 	if (IS_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;
 	else
 		sb->s_d_op = &affs_dentry_operations;