patch-1.3.73 linux/fs/msdos/namei.c

Next file: linux/fs/ncpfs/dir.c
Previous file: linux/fs/minix/bitmap.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v1.3.72/linux/fs/msdos/namei.c linux/fs/msdos/namei.c
@@ -154,9 +154,9 @@
 	char dotsOK;
 	char scantype;
 
-	dotsOK = MSDOS_SB(dir->i_sb)->dotsOK;
-	res = msdos_format_name(MSDOS_SB(dir->i_sb)->name_check,
-	    name,len, msdos_name,1,dotsOK);
+	dotsOK = MSDOS_SB(dir->i_sb)->options.dotsOK;
+	res = msdos_format_name(MSDOS_SB(dir->i_sb)->options.name_check,
+				name,len, msdos_name,1,dotsOK);
 	if (res < 0)
 		return -ENOENT;
 	if((name[0]=='.') && dotsOK){
@@ -302,8 +302,9 @@
 	int ino,res,is_hid;
 
 	if (!dir) return -ENOENT;
-	if ((res = msdos_format_name(MSDOS_SB(dir->i_sb)->name_check,name,len,
-	    msdos_name,0,MSDOS_SB(dir->i_sb)->dotsOK)) < 0) {
+	if ((res = msdos_format_name(MSDOS_SB(dir->i_sb)->options.name_check,
+				     name,len,msdos_name,0,
+				     MSDOS_SB(dir->i_sb)->options.dotsOK)) < 0) {
 		iput(dir);
 		return res;
 	}
@@ -427,8 +428,9 @@
 	char msdos_name[MSDOS_NAME];
 	int ino,res,is_hid;
 
-	if ((res = msdos_format_name(MSDOS_SB(dir->i_sb)->name_check,name,len,
-	    msdos_name,0,MSDOS_SB(dir->i_sb)->dotsOK)) < 0) {
+	if ((res = msdos_format_name(MSDOS_SB(dir->i_sb)->options.name_check,
+				     name,len,msdos_name,0,
+				     MSDOS_SB(dir->i_sb)->options.dotsOK)) < 0) {
 		iput(dir);
 		return res;
 	}
@@ -740,11 +742,13 @@
 	int old_ino,error;
 	int is_hid,old_hid; /* if new file and old file are hidden */
 
-	if ((error = msdos_format_name(MSDOS_SB(old_dir->i_sb)->name_check,
-	    old_name,old_len,old_msdos_name,1,MSDOS_SB(old_dir->i_sb)->dotsOK))
+	if ((error = msdos_format_name(MSDOS_SB(old_dir->i_sb)->options.name_check,
+				       old_name,old_len,old_msdos_name,1,
+				       MSDOS_SB(old_dir->i_sb)->options.dotsOK))
 	    < 0) goto rename_done;
-	if ((error = msdos_format_name(MSDOS_SB(new_dir->i_sb)->name_check,
-	    new_name,new_len,new_msdos_name,0,MSDOS_SB(new_dir->i_sb)->dotsOK))
+	if ((error = msdos_format_name(MSDOS_SB(new_dir->i_sb)->options.name_check,
+				       new_name,new_len,new_msdos_name,0,
+				       MSDOS_SB(new_dir->i_sb)->options.dotsOK))
 	    < 0) goto rename_done;
 	is_hid = (new_name[0]=='.') && (new_msdos_name[0]!='.');
 	old_hid = (old_name[0]=='.') && (old_msdos_name[0]!='.');

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov with Sam's (original) version
of this