Matthew Helsley wrote:
Shailabh,
Please inline your patches. My mail client doesn't include the patch in
the reply if you attach the patch.
Will try but my client (thunderbird) mangles spaces in inlined patches
which is why I've been sending them as attachments. Sigh...shift to pine
or something like it I guess, atleast for patch sending.
On Tue, 2005-08-09 at 18:32 -0400, Shailabh Nagar wrote:
Rename magic (CKRM RCFS rewrite)
Eliminate last uses of "magic".
Signed-off-by: Shailabh Nagar <[EMAIL PROTECTED]>
fs/rcfs/inode.c | 10 +++++-----
include/linux/rcfs.h | 18 ++++--------------
2 files changed, 9 insertions(+), 19 deletions(-)
<snip>
Index: linux-2.6.12/include/linux/rcfs.h
===================================================================
--- linux-2.6.12.orig/include/linux/rcfs.h 2005-08-09
15:30:57.909097200 -0400
+++ linux-2.6.12/include/linux/rcfs.h 2005-08-09 15:30:57.982086104
-0400
@@ -7,18 +7,12 @@
#include <linux/ckrm_rc.h>
#include <linux/ckrm_ce.h>
-/*
- * The following declarations cannot be included in any of ckrm*.h
files
- * without jumping hoops. Remove later when rearrangements done
- */
-
#define RCFS_MAGIC 0x4feedbac
#define RCFS_MAGF_NAMELEN 20
-extern int RCFS_IS_MAGIC;
+extern int RCFS_IS_VIRTUAL;
/*
- * Following strings are the names of the system defined files under
- * the rcfs filesystem
+ * Names of virtual files created by rcfs
*/
#define RCFS_CONFIG_NAME "config"
@@ -27,7 +21,7 @@ extern int RCFS_IS_MAGIC;
#define RCFS_SHARES_NAME "shares"
#define RCFS_RECLASSIFY_NAME "reclassify"
-#define rcfs_is_magic(dentry) ((dentry)->d_fsdata == &RCFS_IS_MAGIC)
+#define rcfs_is_virtual(dentry) ((dentry)->d_fsdata ==
&RCFS_IS_VIRTUAL)
struct rcfs_inode_info {
struct ckrm_core_class *core;
@@ -47,12 +41,8 @@ struct rcfs_magf {
};
struct rcfs_mfdesc {
- struct rcfs_magf *rootmf; /* Root directory and its
magic files */
+ struct rcfs_magf *rootmf; /* root dir & its virtual
files */
The structure name still contains an abbreviated reference to "magic".
Is there any reason you can't simple use "struct rcfs_file" ?
No. Just laziness in changing all references to "magf" "mf" etc.
Also the
field name refers to magic files.
Thanks. will fix.
int rootmflen; /* length of above array */
The field also contains an abbreviated reference to "magic file". If
you don't address all instances of "mf" and "magf" then renaming "magic"
is pointless and, in fact, harmful.
I don't quite agree. It makes the structure names more cryptic since we
call them virtual files now. But I'll put this change on the todo list.
Of course, I'd be happy to take a patch replacing all remaining
instances :-)
- /*
- * Can have a different magf describing magic files
- * for non-root entries too.
- */
};
extern struct rcfs_mfdesc *genmfdesc[];
Here too. Probably lots of other locations this particular point is
relevant.
yes, any explicit use of magic can be removed.
ok, will take a look.
Cheers,
-Matt
-------------------------------------------------------
SF.Net email is Sponsored by the Better Software Conference & EXPO
September 19-22, 2005 * San Francisco, CA * Development Lifecycle Practices
Agile & Plan-Driven Development * Managing Projects & Teams * Testing & QA
Security * Process Improvement & Measurement * http://www.sqe.com/bsce5sf
_______________________________________________
ckrm-tech mailing list
https://lists.sourceforge.net/lists/listinfo/ckrm-tech
