[prev in list] [next in list] [prev in thread] [next in thread] 

List:       linux-ntfs-cvs
Subject:    [Linux-NTFS-cvs] CVS: ntfs-driver-tng/linux/fs/ntfs inode.c,1.56,1.57 inode.h,1.10,1.11 ntfs.h,1.22,
From:       Anton Altaparmakov <antona () users ! sourceforge ! net>
Date:       2002-01-31 3:33:28
[Download RAW message or body]


Changes by: antona

Update of /cvsroot/linux-ntfs/ntfs-driver-tng/linux/fs/ntfs
In directory usw-pr-cvs1:/tmp/cvs-serv7049/linux/fs/ntfs

Modified Files:
	inode.c inode.h ntfs.h super.c 
Log Message:
Add showing of mount options in /proc/mounts.


Index: inode.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfs-driver-tng/linux/fs/ntfs/inode.c,v
retrieving revision 1.56
retrieving revision 1.57
diff -U2 -r1.56 -r1.57
--- inode.c	2002/01/31 02:21:36	1.56
+++ inode.c	2002/01/31 03:33:26	1.57
@@ -1153,2 +1153,26 @@
 }
 
+int ntfs_show_options(struct seq_file *sf, struct vfsmount *mnt)
+{
+	ntfs_volume *vol = NTFS_SB(mnt->mnt_sb);
+	int i;
+
+	seq_printf(sf, ",uid=%i", vol->uid);
+	seq_printf(sf, ",gid=%i", vol->gid);
+	if (vol->fmask == vol->dmask)
+		seq_printf(sf, ",umask=0%o", vol->fmask);
+	else {
+		seq_printf(sf, ",fmask=0%o", vol->fmask);
+		seq_printf(sf, ",dmask=0%o", vol->dmask);
+	}
+	seq_printf(sf, ",mft_zone_multiplier=%i", vol->mft_zone_multiplier);
+	seq_printf(sf, ",nls=%s", vol->nls_map->charset);
+	for (i = 0; on_errors_arr[i].val; i++) {
+		if (on_errors_arr[i].val == vol->on_errors) {
+			seq_printf(sf, ",errors=%s", on_errors_arr[i].str);
+			break;
+		}
+	}
+	return 0;
+}
+

Index: inode.h
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfs-driver-tng/linux/fs/ntfs/inode.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -U2 -r1.10 -r1.11
--- inode.h	2002/01/31 02:21:36	1.10
+++ inode.h	2002/01/31 03:33:26	1.11
@@ -25,4 +25,5 @@
 
 #include "volume.h"
+#include <linux/seq_file.h>
 
 typedef struct _ntfs_inode ntfs_inode;
@@ -136,4 +137,6 @@
 
 extern void ntfs_dirty_inode(struct inode *vi);
+
+extern int ntfs_show_options(struct seq_file *sf, struct vfsmount *mnt);
 
 #endif /* _LINUX_NTFS_FS_INODE_H */

Index: ntfs.h
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfs-driver-tng/linux/fs/ntfs/ntfs.h,v
retrieving revision 1.22
retrieving revision 1.23
diff -U2 -r1.22 -r1.23
--- ntfs.h	2002/01/31 02:21:36	1.22
+++ ntfs.h	2002/01/31 03:33:26	1.23
@@ -211,4 +211,10 @@
 extern struct semaphore ntfs_lock;
 
+typedef struct {
+	int val;
+	char *str;
+} on_errors_str;
+extern on_errors_str on_errors_arr[];
+
 /* From fs/ntfs/compress.c */
 extern int allocate_compression_buffers(void);

Index: super.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfs-driver-tng/linux/fs/ntfs/super.c,v
retrieving revision 1.67
retrieving revision 1.68
diff -U2 -r1.67 -r1.68
--- super.c	2002/01/31 02:21:36	1.67
+++ super.c	2002/01/31 03:33:26	1.68
@@ -32,4 +32,5 @@
 static unsigned long ntfs_nr_compression_users = 0;
 
+/* Error constants/strings from super.c used in inode.c::ntfs_show_options(). */
 typedef enum {
 	ON_ERRORS_PANIC			= 0x01,
@@ -39,4 +40,15 @@
 } ON_ERRORS_ACTIONS;
 
+on_errors_str on_errors_arr[] = {
+	{ ON_ERRORS_PANIC,			     "panic" },
+	{ ON_ERRORS_REMOUNT_RO,			     "remount-ro", },
+	{ ON_ERRORS_CONTINUE,			     "continue", },
+	{ ON_ERRORS_RECOVER,			     "recover" },
+	{ ON_ERRORS_RECOVER || ON_ERRORS_PANIC,	     "recover_or_panic" },
+	{ ON_ERRORS_RECOVER || ON_ERRORS_REMOUNT_RO, "recover_or_remount-ro" },
+	{ ON_ERRORS_RECOVER || ON_ERRORS_CONTINUE,   "recover_or_continue" },
+	{ 0,					     NULL }
+};
+
 /**
  * parse_options - parse the (re)mount options
@@ -55,20 +67,4 @@
 	int mft_zone_multiplier = -1, on_errors = -1;
 	struct nls_table *nls_map = NULL;
-	struct {
-		char *str;
-		int val;
-	} on_errors_arr[] = {
-		{ "panic",			ON_ERRORS_PANIC },
-		{ "remount-ro",			ON_ERRORS_REMOUNT_RO },
-		{ "continue",			ON_ERRORS_CONTINUE },
-		{ "recover",			ON_ERRORS_RECOVER },
-		{ "recover_or_panic",		ON_ERRORS_RECOVER ||
-							ON_ERRORS_PANIC },
-		{ "recover_or_remount-ro", 	ON_ERRORS_RECOVER ||
-							ON_ERRORS_REMOUNT_RO },
-		{ "recover_or_continue",	ON_ERRORS_RECOVER ||
-							ON_ERRORS_CONTINUE },
-		{ NULL,				0 }
-	};
 
 	/* I am lazy... (-8 */
@@ -1327,5 +1323,5 @@
 	fh_to_dentry:	NULL,		/* Get dentry for given file handle. */
 	dentry_to_fh:	NULL,		/* Get file handle for given dentry. */
-	show_options:	NULL,		/* Show mount options in proc. */
+	show_options:	ntfs_show_options, /* Show mount options in proc. */
 };
 


_______________________________________________
Linux-NTFS-cvs mailing list
Linux-NTFS-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/linux-ntfs-cvs
[prev in list] [next in list] [prev in thread] [next in thread]