GFS2: Pre-pull patch posting
Subsystems (2)
As merge time is approaching, here is the current content of the GFS2 -nmw git tree. I'm not expecting to take any more patches now for the current merge window unless any last minute bugs are discovered.
There is not a huge amount new this time. Some extra context for uevent messages, better error handling during block allocation, and a clean up of extended attribute support. There is still more to do on the extended attribute side of things, but this is a good start I think.
There are a few bug fixes as well. Once these patches are merged I'm intending to start off the next -nmw tree with a patch to remove some of the (now unused) sysfs files as per the message on cluster-devel a few weeks back.
Steve.
PATCH 1/15 GFS2: Add online uevent to GFS2
We already have an offline uevent (used when a withdraw occurs) but no online uevent. This adds an online uevent so that userspace will be able to detect a successful mount by means other than not receiving a remove event after the add & recovery (change) uevents.
It has also been added to the remount path as well - we can't use a change uevent there as older GFS2 userspace acts on change uevents according to the state that it thinks the fs is in, so we can't easily add any new ones.
--- fs/gfs2/ops_fstype.c | 13 ++++++++++++- fs/gfs2/super.c | 1 + fs/gfs2/super.h | 4 ++-- 3 files changed, 15 insertions(+), 3 deletions(-)
fs/gfs2/ops_fstype.c +12 -1
@@ -1133,6 +1133,17 @@ void gfs2_lm_unmount(struct gfs2_sbd *sdp) lm->lm_unmount (sdp); } +void gfs2_online_uevent (struct gfs2_sbd *sdp) +{ +struct super_block *sb = sdp->sd_vfs; +char ro[20 ]; +char spectator[20 ]; +char *envp[] = { ro, spectator,NULL }; +sprintf (ro,"RDONLY=%d" , (sb->s_flags &MS_RDONLY ) ?1 :0 ); +sprintf (spectator,"SPECTATOR=%d" , sdp->sd_args.ar_spectator ?1 :0 ); +kobject_uevent_env (&sdp->sd_kobj,KOBJ_ONLINE , envp); +} +/** * fill_super - Read in superblock * @sb: The VFS superblock
@@ -1236,7 +1247,7 @@ static int fill_super(struct super_block *sb, void *data, int silent) }gfs2_glock_dq_uninit (&mount_gh); - +gfs2_online_uevent (sdp);return 0 ; fail_threads:
fs/gfs2/super.c +1 -0
@@ -1084,6 +1084,7 @@ static int gfs2_remount_fs(struct super_block *sb, int *flags, char *data) gt->gt_log_flush_secs = args.ar_commit;spin_unlock (>->gt_spin); +gfs2_online_uevent (sdp);return 0 ; }
fs/gfs2/super.h +2 -2
@@ -25,7 +25,7 @@ static inline unsigned int gfs2_jindex_size(struct gfs2_sbd *sdp)return x; } -void gfs2_jindex_free (struct gfs2_sbd *sdp); +extern void gfs2_jindex_free (struct gfs2_sbd *sdp);extern int gfs2_mount_args (struct gfs2_sbd *sdp,struct gfs2_args *args,char *data);
@@ -36,7 +36,7 @@ extern int gfs2_lookup_in_master_dir(struct gfs2_sbd *sdp, char *filename, struct gfs2_inode **ipp);extern int gfs2_make_fs_rw (struct gfs2_sbd *sdp); - +extern void gfs2_online_uevent (struct gfs2_sbd *sdp);extern int gfs2_statfs_init (struct gfs2_sbd *sdp);extern void gfs2_statfs_change (struct gfs2_sbd *sdp,s64 total,s64 free,s64 dinodes);
Signature · 1 line
1.6.2.5
PATCH 2/15 GFS2: Add some more info to uevents
With each uevent, we now always include the journal ID. We can't call it JID since that is already in use by some of the individual events relating to recovery, so we use JOURNALID instead. We don't send the JOURNALID for spectator mounts, since there isn't one.
Also the ADD event now has both RDONLY and SPECTATOR information to match that of the ONLINE event.
--- fs/gfs2/sys.c | 13 ++++++++++--- 1 files changed, 10 insertions(+), 3 deletions(-)
fs/gfs2/sys.c +10 -3
@@ -519,7 +519,14 @@ static struct attribute_group lock_module_group = {int gfs2_sys_fs_add (struct gfs2_sbd *sdp) { +struct super_block *sb = sdp->sd_vfs;int error; +char ro[20 ]; +char spectator[20 ]; +char *envp[] = { ro, spectator,NULL }; + +sprintf (ro,"RDONLY=%d" , (sb->s_flags &MS_RDONLY ) ?1 :0 ); +sprintf (spectator,"SPECTATOR=%d" , sdp->sd_args.ar_spectator ?1 :0 ); sdp->sd_kobj.kset = gfs2_kset; error = kobject_init_and_add(&sdp->sd_kobj, &gfs2_ktype, NULL,
@@ -535,7 +542,7 @@ int gfs2_sys_fs_add(struct gfs2_sbd *sdp)if (error) goto fail_tune; -kobject_uevent (&sdp->sd_kobj,KOBJ_ADD ); +kobject_uevent_env (&sdp->sd_kobj,KOBJ_ADD , envp);return 0 ; fail_tune:
@@ -554,7 +561,6 @@ void gfs2_sys_fs_del(struct gfs2_sbd *sdp)kobject_put (&sdp->sd_kobj); } -static int gfs2_uevent (struct kset *kset,struct kobject *kobj,struct kobj_uevent_env *env) {
@@ -563,6 +569,8 @@ static int gfs2_uevent(struct kset *kset, struct kobject *kobj,add_uevent_var (env,"LOCKTABLE=%s" , sdp->sd_table_name);add_uevent_var (env,"LOCKPROTO=%s" , sdp->sd_proto_name); +if (!sdp->sd_args.ar_spectator) +add_uevent_var (env,"JOURNALID=%u" , sdp->sd_lockstruct.ls_jid);if (gfs2_uuid_valid (uuid)) { add_uevent_var(env, "UUID=%02X%02X%02X%02X-%02X%02X-%02X%02X-" "%02X%02X-%02X%02X%02X%02X%02X%02X",
@@ -578,7 +586,6 @@ static struct kset_uevent_ops gfs2_uevent_ops = { .uevent = gfs2_uevent, }; -int gfs2_sys_init (void ) { gfs2_kset =kset_create_and_add ("gfs2" , &gfs2_uevent_ops, fs_kobj);
Signature · 1 line
1.6.2.5
PATCH 3/15 GFS2: Improve error handling in inode allocation
A little while back, block allocation was given some improved error handling which meant that -EIO was returned in the case of there being a problem in the resource group data. In addition a message is printed explaning what went wrong and how to fix it. This extends that error handling so that it also covers inode allocation too.
--- fs/gfs2/inode.c | 2 +- fs/gfs2/rgrp.c | 36 +++++++++++++++++++++++++----------- fs/gfs2/rgrp.h | 2 +- 3 files changed, 27 insertions(+), 13 deletions(-)
fs/gfs2/inode.c +1 -1
@@ -731,7 +731,7 @@ static int alloc_dinode(struct gfs2_inode *dip, u64 *no_addr, u64 *generation)if (error) goto out_ipreserv; - *no_addr =gfs2_alloc_di (dip, generation); + error =gfs2_alloc_di (dip, no_addr, generation);gfs2_trans_end (sdp);
fs/gfs2/rgrp.c +25 -11
@@ -1459,6 +1459,16 @@ int gfs2_rgrp_dump(struct seq_file *seq, const struct gfs2_glock *gl)return 0 ; } +static void gfs2_rgrp_error (struct gfs2_rgrpd *rgd) +{ +struct gfs2_sbd *sdp = rgd->rd_sbd; +fs_warn (sdp,"rgrp %llu has an error, marking it readonly until umount\n" , + (unsigned long long )rgd->rd_addr); +fs_warn (sdp,"umount on all nodes and run fsck.gfs2 to fix the error\n" ); +gfs2_rgrp_dump (NULL , rgd->rd_gl); + rgd->rd_flags |=GFS2_RDF_ERROR ; +} +/** * gfs2_alloc_block - Allocate one or more blocks * @ip: the inode to allocate the block for
@@ -1520,22 +1530,20 @@ int gfs2_alloc_block(struct gfs2_inode *ip, u64 *bn, unsigned int *n)return 0 ; rgrp_error: -fs_warn (sdp,"rgrp %llu has an error, marking it readonly until umount\n" , - (unsigned long long )rgd->rd_addr); -fs_warn (sdp,"umount on all nodes and run fsck.gfs2 to fix the error\n" ); -gfs2_rgrp_dump (NULL , rgd->rd_gl); - rgd->rd_flags |=GFS2_RDF_ERROR ; +gfs2_rgrp_error (rgd);return -EIO ; }/** * gfs2_alloc_di - Allocate a dinode * @dip: the directory that the inode is going in +* @bn: the block number which is allocated +* @generation: the generation number of the inode * -* Returns: the block allocated +* Returns: 0 on success or error */ -u64 gfs2_alloc_di (struct gfs2_inode *dip,u64 *generation) +int gfs2_alloc_di (struct gfs2_inode *dip,u64 *bn,u64 *generation) {struct gfs2_sbd *sdp =GFS2_SB (&dip->i_inode);struct gfs2_alloc *al = dip->i_alloc;
@@ -1546,12 +1554,13 @@ u64 gfs2_alloc_di(struct gfs2_inode *dip, u64 *generation) blk =rgblk_search (rgd, rgd->rd_last_alloc,GFS2_BLKST_FREE ,GFS2_BLKST_DINODE , &n); -BUG_ON (blk ==BFITNOENT ); - rgd->rd_last_alloc = blk; +/* Since all blocks are reserved in advance, this shouldn't happen */ +if (blk ==BFITNOENT ) + goto rgrp_error; + rgd->rd_last_alloc = blk; block = rgd->rd_data0 + blk; -gfs2_assert_withdraw (sdp, rgd->rd_free); rgd->rd_free--; rgd->rd_dinodes++;
@@ -1568,7 +1577,12 @@ u64 gfs2_alloc_di(struct gfs2_inode *dip, u64 *generation) rgd->rd_free_clone--;spin_unlock (&sdp->sd_rindex_spin);trace_gfs2_block_alloc (dip, block,1 ,GFS2_BLKST_DINODE ); -return block; + *bn = block; +return 0 ; + +rgrp_error: +gfs2_rgrp_error (rgd); +return -EIO ; }/**
fs/gfs2/rgrp.h +1 -1
@@ -47,7 +47,7 @@ extern void gfs2_inplace_release(struct gfs2_inode *ip);extern unsigned char gfs2_get_block_type (struct gfs2_rgrpd *rgd,u64 block);extern int gfs2_alloc_block (struct gfs2_inode *ip,u64 *bn,unsigned int *n); -extern u64 gfs2_alloc_di (struct gfs2_inode *ip,u64 *generation); +extern int gfs2_alloc_di (struct gfs2_inode *ip,u64 *bn,u64 *generation);extern void gfs2_free_data (struct gfs2_inode *ip,u64 bstart,u32 blen);extern void gfs2_free_meta (struct gfs2_inode *ip,u64 bstart,u32 blen);
Signature · 1 line
1.6.2.5
PATCH 4/15 GFS2: Replace assertion with proper error handling
One fewer assert, one more place we can recover gracefully if there is an error.
--- fs/gfs2/rgrp.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-)
fs/gfs2/rgrp.c +3 -1
@@ -1561,7 +1561,9 @@ int gfs2_alloc_di(struct gfs2_inode *dip, u64 *bn, u64 *generation) rgd->rd_last_alloc = blk; block = rgd->rd_data0 + blk; -gfs2_assert_withdraw (sdp, rgd->rd_free); +if (rgd->rd_free ==0 ) + goto rgrp_error; + rgd->rd_free--; rgd->rd_dinodes++; *generation = rgd->rd_igeneration++;
Signature · 1 line
1.6.2.5
PATCH 5/15 GFS2: Add sysfs link to device
This adds a link from the per-gfs2 sb sysfs directory to the block device upon which the filesystem is mounted. The link is called "device", strangely enough :-)
--- fs/gfs2/sys.c | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-)
fs/gfs2/sys.c +10 -0
@@ -16,6 +16,7 @@#include <linux/kobject.h> #include <asm/uaccess.h> #include <linux/gfs2_ondisk.h> +#include <linux/genhd.h> #include "gfs2.h" #include "incore.h"
@@ -542,9 +543,17 @@ int gfs2_sys_fs_add(struct gfs2_sbd *sdp)if (error) goto fail_tune; + error =sysfs_create_link (&sdp->sd_kobj, + &disk_to_dev (sb->s_bdev->bd_disk)->kobj, +"device" ); +if (error) + goto fail_lock_module; +kobject_uevent_env (&sdp->sd_kobj,KOBJ_ADD , envp);return 0 ; +fail_lock_module: +sysfs_remove_group (&sdp->sd_kobj, &lock_module_group); fail_tune:sysfs_remove_group (&sdp->sd_kobj, &tune_group); fail_reg:
@@ -556,6 +565,7 @@ fail:void gfs2_sys_fs_del (struct gfs2_sbd *sdp) { +sysfs_remove_link (&sdp->sd_kobj,"device" );sysfs_remove_group (&sdp->sd_kobj, &tune_group);sysfs_remove_group (&sdp->sd_kobj, &lock_module_group);kobject_put (&sdp->sd_kobj);
Signature · 1 line
1.6.2.5
PATCH 6/15 GFS2: Add a document explaining GFS2's uevents
This will be essential reading for anybody who wants to understand how GFS2 interacts with the userland gfs_controld, and the details of recovery.
--- Documentation/filesystems/gfs2-uevents.txt | 100 ++++++++++++++++++++++++++++ 1 files changed, 100 insertions(+), 0 deletions(-) create mode 100644 Documentation/filesystems/gfs2-uevents.txt
Documentation/filesystems/gfs2-uevents.txt new file +100 -0
@@ -0,0 +1,100 @@ + uevents and GFS2 + ================== + +During the lifetime of a GFS2 mount, a number of uevents are generated. +This document explains what the events are and what they are used +for (by gfs_controld in gfs2-utils). + +A list of GFS2 uevents +----------------------- + +1. ADD + +The ADD event occurs at mount time. It will always be the first +uevent generated by the newly created filesystem. If the mount +is successful, an ONLINE uevent will follow. If it is not successful +then a REMOVE uevent will follow. + +The ADD uevent has two environment variables: SPECTATOR=[0|1] +and RDONLY=[0|1] that specify the spectator status (a read-only mount +with no journal assigned), and read-only (with journal assigned) status +of the filesystem respectively. + +2. ONLINE + +The ONLINE uevent is generated after a successful mount or remount. It +has the same environment variables as the ADD uevent. The ONLINE +uevent, along with the two environment variables for spectator and +RDONLY are a relatively recent addition (2.6.32-rc+) and will not +be generated by older kernels. + +3. CHANGE + +The CHANGE uevent is used in two places. One is when reporting the +successful mount of the filesystem by the first node (FIRSTMOUNT=Done). +This is used as a signal by gfs_controld that it is then ok for other +nodes in the cluster to mount the filesystem. + +The other CHANGE uevent is used to inform of the completion +of journal recovery for one of the filesystems journals. It has +two environment variables, JID= which specifies the journal id which +has just been recovered, and RECOVERY=[Done|Failed] to indicate the +success (or otherwise) of the operation. These uevents are generated +for every journal recovered, whether it is during the initial mount +process or as the result of gfs_controld requesting a specific journal +recovery via the /sys/fs/gfs2/<fsname>/lock_module/recovery file. + +Because the CHANGE uevent was used (in early versions of gfs_controld) +without checking the environment variables to discover the state, we +cannot add any more functions to it without running the risk of +someone using an older version of the user tools and breaking their +cluster. For this reason the ONLINE uevent was used when adding a new +uevent for a successful mount or remount. + +4. OFFLINE + +The OFFLINE uevent is only generated due to filesystem errors and is used +as part of the "withdraw" mechanism. Currently this doesn't give any +information about what the error is, which is something that needs to +be fixed. + +5. REMOVE + +The REMOVE uevent is generated at the end of an unsuccessful mount +or at the end of a umount of the filesystem. All REMOVE uevents will +have been preceeded by at least an ADD uevent for the same fileystem, +and unlike the other uevents is generated automatically by the kernel's +kobject subsystem. + + +Information common to all GFS2 uevents (uevent environment variables) +---------------------------------------------------------------------- + +1. LOCKTABLE= + +The LOCKTABLE is a string, as supplied on the mount command +line (locktable=) or via fstab. It is used as a filesystem label +as well as providing the information for a lock_dlm mount to be +able to join the cluster. + +2. LOCKPROTO= + +The LOCKPROTO is a string, and its value depends on what is set +on the mount command line, or via fstab. It will be either +lock_nolock or lock_dlm. In the future other lock managers +may be supported. + +3. JOURNALID= + +If a journal is in use by the filesystem (journals are not +assigned for spectator mounts) then this will give the +numeric journal id in all GFS2 uevents. + +4. UUID= + +With recent versions of gfs2-utils, mkfs.gfs2 writes a UUID +into the filesystem superblock. If it exists, this will +be included in every uevent relating to the filesystem. + + +
Signature · 1 line
1.6.2.5
PATCH 7/15 GFS2: free disk inode which is deleted by remote node -V2
From: Wengang Wang <[email protected]>
this patch is for the same problem that Benjamin Marzinski fixes at commit b94a170e96dc416828af9d350ae2e34b70ae7347
quotation of the original problem:
---cut here---
When a file is deleted from a gfs2 filesystem on one node, a dcache entry for it may still exist on other nodes in the cluster. If this happens, gfs2 will be unable to free this file on disk. Because of this, it's possible to have a gfs2 filesystem with no files on it and no free space. With this patch, when a node receives a callback notifying it that the file is being deleted on another node, it schedules a new workqueue thread to remove the file's dcache entry.
---end cut---
after applying Benjamin's patch, I think there is still a case in which the disk inode remains even when "no space" is hit. the case is that when running d_prune_aliases() against the inode, there are one or more dentries(aliases) which have reference count number > 0. in this case the dentries won't be pruned. and even later, the reference count becomes to 0, the dentries can still be cached in memory. unfortunately, no callback come again, things come back to the state before the callback runs. thus the on disk inode remains there until in memoryinode is removed for some other reason(shrinking inode cache or unmount the volume..).
this patch is to remove those dentries when their reference count becomes to 0 and the inode is deleted by remote node. for implementation, gfs2_dentry_delete() is added as dentry_operations.d_delete. the function returns true when the inode is deleted by remote node. in dput(), gfs2_dentry_delete() is called and since it returns true, the dentry is unhashed from dcache and then removed. when all dentries are removed, the in memory inode get removed so that the on disk inode is freed.
--- fs/gfs2/dentry.c | 18 ++++++++++++++++++ 1 files changed, 18 insertions(+), 0 deletions(-)
fs/gfs2/dentry.c +18 -0
@@ -107,8 +107,26 @@ static int gfs2_dhash(struct dentry *dentry, struct qstr *str)return 0 ; } +static int gfs2_dentry_delete (struct dentry *dentry) +{ +struct gfs2_inode *ginode; + +if (!dentry->d_inode) +return 0 ; + + ginode =GFS2_I (dentry->d_inode); +if (!ginode->i_iopen_gh.gh_gl) +return 0 ; + +if (test_bit (GLF_DEMOTE , &ginode->i_iopen_gh.gh_gl->gl_flags)) +return 1 ; + +return 0 ; +} +const struct dentry_operations gfs2_dops = { .d_revalidate = gfs2_drevalidate, .d_hash = gfs2_dhash, + .d_delete = gfs2_dentry_delete, };
Signature · 1 line
1.6.2.5
PATCH 8/15 GFS2: jumping to wrong label?
From: Roel Kluin <[email protected]>
Also a gfs2_glock_dq() is required here.
--- fs/gfs2/ops_inode.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
fs/gfs2/ops_inode.c +1 -1
@@ -349,7 +349,7 @@ static int gfs2_unlink(struct inode *dir, struct dentry *dentry) error =gfs2_trans_begin (sdp,2 *RES_DINODE +RES_LEAF +RES_RG_BIT ,0 );if (error) - goto out_rgrp; + goto out_gunlock; error =gfs2_dir_del (dip, &dentry->d_name);if (error)
Signature · 1 line
1.6.2.5
PATCH 9/15 GFS2: Add "-o errors=panic|withdraw" mount options
From: Bob Peterson <[email protected]>
This patch adds "-o errors=panic" and "-o errors=withdraw" to the gfs2 mount options. The "errors=withdraw" option is today's current behaviour, meaning to withdraw from the file system if a non-serious gfs2 error occurs. The new "errors=panic" option tells gfs2 to force a kernel panic if a non-serious gfs2 file system error occurs. This may be useful, for example, where fabric-level fencing is used that has no way to reboot (such as fence_scsi).
--- fs/gfs2/incore.h | 7 +++++++ fs/gfs2/ops_fstype.c | 1 + fs/gfs2/super.c | 36 ++++++++++++++++++++++++++++++++++++ fs/gfs2/util.c | 41 +++++++++++++++++++++++++++-------------- 4 files changed, 71 insertions(+), 14 deletions(-)
fs/gfs2/incore.h +7 -0
@@ -406,6 +406,12 @@ struct gfs2_statfs_change_host {#define GFS2_DATA_WRITEBACK 1#define GFS2_DATA_ORDERED 2 +#define GFS2_ERRORS_DEFAULT GFS2_ERRORS_WITHDRAW +#define GFS2_ERRORS_WITHDRAW 0 +#define GFS2_ERRORS_CONTINUE 1/* place holder for future feature */ +#define GFS2_ERRORS_RO 2/* place holder for future feature */ +#define GFS2_ERRORS_PANIC 3 +struct gfs2_args {char ar_lockproto[GFS2_LOCKNAME_LEN ];/* Name of the Lock Protocol */ char ar_locktable[GFS2_LOCKNAME_LEN ];/* Name of the Lock Table */
@@ -422,6 +428,7 @@ struct gfs2_args { unsigned int ar_data:2; /* ordered/writeback */ unsigned int ar_meta:1; /* mount metafs */ unsigned int ar_discard:1; /* discard requests */ + unsigned int ar_errors:2; /* errors=withdraw | panic */int ar_commit;/* Commit interval */ };
fs/gfs2/ops_fstype.c +1 -0
@@ -1168,6 +1168,7 @@ static int fill_super(struct super_block *sb, void *data, int silent) sdp->sd_args.ar_quota =GFS2_QUOTA_DEFAULT ; sdp->sd_args.ar_data =GFS2_DATA_DEFAULT ; sdp->sd_args.ar_commit =60 ; + sdp->sd_args.ar_errors =GFS2_ERRORS_DEFAULT ; error =gfs2_mount_args (sdp, &sdp->sd_args, data);if (error) {
fs/gfs2/super.c +36 -0
@@ -68,6 +68,8 @@ enum { Opt_discard, Opt_nodiscard, Opt_commit, + Opt_err_withdraw, + Opt_err_panic, Opt_error, };
@@ -97,6 +99,8 @@ static const match_table_t tokens = { {Opt_discard, "discard"}, {Opt_nodiscard, "nodiscard"}, {Opt_commit, "commit=%d"}, + {Opt_err_withdraw, "errors=withdraw"}, + {Opt_err_panic, "errors=panic"}, {Opt_error, NULL} };
@@ -152,6 +156,11 @@ int gfs2_mount_args(struct gfs2_sbd *sdp, struct gfs2_args *args, char *options) args->ar_localcaching =1 ;break ;case Opt_debug: +if (args->ar_errors ==GFS2_ERRORS_PANIC ) { +fs_info (sdp,"-o debug and -o errors=panic " +"are mutually exclusive.\n" ); +return -EINVAL ; + } args->ar_debug =1 ;break ;case Opt_nodebug:
@@ -205,6 +214,17 @@ int gfs2_mount_args(struct gfs2_sbd *sdp, struct gfs2_args *args, char *options)return rv ? rv : -EINVAL ; }break ; +case Opt_err_withdraw: + args->ar_errors =GFS2_ERRORS_WITHDRAW ; +break ; +case Opt_err_panic: +if (args->ar_debug) { +fs_info (sdp,"-o debug and -o errors=panic " +"are mutually exclusive.\n" ); +return -EINVAL ; + } + args->ar_errors =GFS2_ERRORS_PANIC ; +break ;case Opt_error:default :fs_info (sdp,"invalid mount option: %s\n" , o);
@@ -1226,6 +1246,22 @@ static int gfs2_show_options(struct seq_file *s, struct vfsmount *mnt) lfsecs = sdp->sd_tune.gt_log_flush_secs;if (lfsecs !=60 )seq_printf (s,",commit=%d" , lfsecs); +if (args->ar_errors !=GFS2_ERRORS_DEFAULT ) { +const char *state; + +switch (args->ar_errors) { +case GFS2_ERRORS_WITHDRAW : + state ="withdraw" ; +break ; +case GFS2_ERRORS_PANIC : + state ="panic" ; +break ; +default : + state ="unknown" ; +break ; + } +seq_printf (s,",errors=%s" , state); + }return 0 ; }
fs/gfs2/util.c +27 -14
68 lines not on this page · raw message
Signature · 1 line
1.6.2.5
PATCH 10/15 GFS2: Add explanation of extended attr on-disk format
Some useful info regarding the on-disk representation of GFS2 extended attributes.
--- include/linux/gfs2_ondisk.h | 22 ++++++++++++++++++++++ 1 files changed, 22 insertions(+), 0 deletions(-)
include/linux/gfs2_ondisk.h +22 -0
@@ -333,6 +333,28 @@ struct gfs2_leaf {/* * Extended attribute header format +* +* This works in a similar way to dirents. There is a fixed size header +* followed by a variable length section made up of the name and the +* associated data. In the case of a "stuffed" entry, the value is +* inline directly after the name, the ea_num_ptrs entry will be +* zero in that case. For non-"stuffed" entries, there will be +* a set of pointers (aligned to 8 byte boundary) to the block(s) +* containing the value. +* +* The blocks containing the values and the blocks containing the +* extended attribute headers themselves all start with the common +* metadata header. Each inode, if it has extended attributes, will +* have either a single block containing the extended attribute headers +* or a single indirect block pointing to blocks containing the +* extended attribure headers. +* +* The maximim size of the data part of an extended attribute is 64k +* so the number of blocks required depends upon block size. Since the +* block size also determines the number of pointers in an indirect +* block, its a fairly complicated calculation to work out the maximum +* number of blocks that an inode may have relating to extended attributes. +* */ #define GFS2_EA_MAX_NAME_LEN 255
Signature · 1 line
1.6.2.5
PATCH 11/15 GFS2: Clean up of extended attribute support
This has been on my list for some time. We need to change the way in which we handle extended attributes to allow faster file creation times (by reducing the number of transactions required) and the extended attribute code is the main obstacle to this.
In addition to that, the VFS provides a way to demultiplex the xattr calls which we ought to be using, rather than rolling our own. This patch changes the GFS2 code to use that VFS feature and as a result the code shrinks by a couple of hundred lines or so, and becomes easier to read.
I'm planning on doing further clean up work in this area, but this patch is a good start. The cleaned up code also uses the more usual "xattr" shorthand, I plan to eliminate the use of "eattr" eventually and in the mean time it serves as a flag as to which bits of the code have been updated.
--- fs/gfs2/Makefile | 2 +- fs/gfs2/acl.c | 104 ++++++------- fs/gfs2/eaops.c | 157 ------------------- fs/gfs2/eaops.h | 30 ---- fs/gfs2/eattr.c | 421 ++++++++++++++++++++++++++++---------------------- fs/gfs2/eattr.h | 52 ++----- fs/gfs2/file.c | 1 - fs/gfs2/inode.c | 12 +-- fs/gfs2/ops_fstype.c | 1 + fs/gfs2/ops_inode.c | 78 ++++----- fs/gfs2/super.h | 1 + 11 files changed, 333 insertions(+), 526 deletions(-) delete mode 100644 fs/gfs2/eaops.c delete mode 100644 fs/gfs2/eaops.h
fs/gfs2/Makefile +1 -1
@@ -1,6 +1,6 @@ EXTRA_CFLAGS := -I$(src) obj-$(CONFIG_GFS2_FS) += gfs2.o -gfs2-y := acl.o bmap.o dir.o eaops.o eattr.o glock.o \ +gfs2-y := acl.o bmap.o dir.o eattr.o glock.o \ glops.o inode.o log.o lops.o main.o meta_io.o \ aops.o dentry.o export.o file.o \ ops_fstype.o ops_inode.o quota.o \
fs/gfs2/acl.c +45 -59
200 lines not on this page · raw message
fs/gfs2/eaops.c deleted +0 -157
157 lines not on this page · raw message
fs/gfs2/eaops.h deleted +0 -30
@@ -1,30 +0,0 @@ -/* -* Copyright (C) Sistina Software, Inc. 1997-2003 All rights reserved. -* Copyright (C) 2004-2006 Red Hat, Inc. All rights reserved. -* -* This copyrighted material is made available to anyone wishing to use, -* modify, copy, or redistribute it subject to the terms and conditions -* of the GNU General Public License version 2. -*/ - -#ifndef __EAOPS_DOT_H__ -#define __EAOPS_DOT_H__ - -struct gfs2_ea_request ; -struct gfs2_inode ; - -struct gfs2_eattr_operations { -int (*eo_get) (struct gfs2_inode *ip,struct gfs2_ea_request *er); -int (*eo_set) (struct gfs2_inode *ip,struct gfs2_ea_request *er); -int (*eo_remove) (struct gfs2_inode *ip,struct gfs2_ea_request *er); -char *eo_name; -}; - -unsigned int gfs2_ea_name2type (const char *name,const char **truncated_name); - -extern const struct gfs2_eattr_operations gfs2_system_eaops; - -extern const struct gfs2_eattr_operations *gfs2_ea_ops[]; - -#endif /* __EAOPS_DOT_H__ */ -
fs/gfs2/eattr.c +237 -184
632 lines not on this page · raw message
fs/gfs2/eattr.h +12 -40
78 lines not on this page · raw message
fs/gfs2/file.c +0 -1
@@ -38,7 +38,6 @@#include "rgrp.h" #include "trans.h" #include "util.h" -#include "eaops.h" /** * gfs2_llseek - seek to a location in a file
fs/gfs2/inode.c +1 -11
@@ -924,7 +924,6 @@ static int gfs2_security_init(struct gfs2_inode *dip, struct gfs2_inode *ip)size_t len;void *value;char *name; -struct gfs2_ea_request er; err =security_inode_init_security (&ip->i_inode, &dip->i_inode, &name, &value, &len);
@@ -935,16 +934,7 @@ static int gfs2_security_init(struct gfs2_inode *dip, struct gfs2_inode *ip)return err; } -memset (&er,0 ,sizeof (struct gfs2_ea_request )); - - er.er_type =GFS2_EATYPE_SECURITY ; - er.er_name = name; - er.er_data = value; - er.er_name_len =strlen (name); - er.er_data_len = len; - - err =gfs2_ea_set_i (ip, &er); - + err =gfs2_xattr_set (&ip->i_inode,GFS2_EATYPE_SECURITY , name, value, len,0 );kfree (value);kfree (name);
fs/gfs2/ops_fstype.c +1 -0
@@ -1186,6 +1186,7 @@ static int fill_super(struct super_block *sb, void *data, int silent) sb->s_magic =GFS2_MAGIC ; sb->s_op = &gfs2_super_ops; sb->s_export_op = &gfs2_export_ops; + sb->s_xattr = gfs2_xattr_handlers; sb->s_time_gran =1 ; sb->s_maxbytes =MAX_LFS_FILESIZE ;
fs/gfs2/ops_inode.c +35 -43
102 lines not on this page · raw message
fs/gfs2/super.h +1 -0
@@ -54,6 +54,7 @@ extern struct file_system_type gfs2meta_fs_type;extern const struct export_operations gfs2_export_ops;extern const struct super_operations gfs2_super_ops;extern const struct dentry_operations gfs2_dops; +extern struct xattr_handler *gfs2_xattr_handlers[];#endif /* __SUPER_DOT_H__ */
Signature · 1 line
1.6.2.5
PATCH 12/15 GFS2: Rename eattr.[ch] as xattr.[ch]
Use the more conventional name for the extended attribute support code. Update all the places which care.
--- fs/gfs2/Makefile | 2 +- fs/gfs2/acl.c | 2 +- fs/gfs2/eattr.c | 1558 --------------------------------------------------- fs/gfs2/eattr.h | 72 --- fs/gfs2/inode.c | 2 +- fs/gfs2/ops_inode.c | 2 +- fs/gfs2/super.c | 2 +- fs/gfs2/xattr.c | 1558 +++++++++++++++++++++++++++++++++++++++++++++++++++ fs/gfs2/xattr.h | 72 +++ 9 files changed, 1635 insertions(+), 1635 deletions(-) delete mode 100644 fs/gfs2/eattr.c delete mode 100644 fs/gfs2/eattr.h create mode 100644 fs/gfs2/xattr.c create mode 100644 fs/gfs2/xattr.h
fs/gfs2/Makefile +1 -1
@@ -1,6 +1,6 @@ EXTRA_CFLAGS := -I$(src) obj-$(CONFIG_GFS2_FS) += gfs2.o -gfs2-y := acl.o bmap.o dir.o eattr.o glock.o \ +gfs2-y := acl.o bmap.o dir.o xattr.o glock.o \ glops.o inode.o log.o lops.o main.o meta_io.o \ aops.o dentry.o export.o file.o \ ops_fstype.o ops_inode.o quota.o \
fs/gfs2/acl.c +1 -1
@@ -19,7 +19,7 @@#include "gfs2.h" #include "incore.h" #include "acl.h" -#include "eattr.h" +#include "xattr.h" #include "glock.h" #include "inode.h" #include "meta_io.h"
fs/gfs2/eattr.c deleted +0 -1558
1,558 lines not on this page · raw message
fs/gfs2/eattr.h deleted +0 -72
72 lines not on this page · raw message
fs/gfs2/inode.c +1 -1
@@ -24,7 +24,7 @@#include "acl.h" #include "bmap.h" #include "dir.h" -#include "eattr.h" +#include "xattr.h" #include "glock.h" #include "glops.h" #include "inode.h"
fs/gfs2/ops_inode.c +1 -1
@@ -26,7 +26,7 @@#include "acl.h" #include "bmap.h" #include "dir.h" -#include "eattr.h" +#include "xattr.h" #include "glock.h" #include "inode.h" #include "meta_io.h"
fs/gfs2/super.c +1 -1
@@ -38,7 +38,7 @@#include "trans.h" #include "util.h" #include "sys.h" -#include "eattr.h" +#include "xattr.h" #define args_neq (a1, a2, x) ((a1)->ar_##x != (a2)->ar_##x)
fs/gfs2/xattr.c new file +1558 -0
1,331 lines not on this page · raw message
fs/gfs2/xattr.h new file +72 -0
72 lines not on this page · raw message
The rest of this diff is not shown. View the raw message.
Signature · 1 line
1.6.2.5
Part of the diff is not shown here. View the raw message.
PATCH 13/15 GFS2: Remove no_formal_ino generating code
The inum structure used throughout GFS2 has two fields. One no_addr is the disk block number of the inode in question and is used everywhere as the inode number. The other, no_formal_ino, is used only as the generation number for NFS.
Historically the no_formal_ino field was set using a complicated system of one global and one per-node file containing inode numbers in order to ensure that each no_formal_ino was unique. Also this code made no provision for what would happen when eventually the (64 bit) numbers ran out. Now I know that is pretty unlikely to happen given the large space of numbers, but it is possible nevertheless.
The only guarantee required for no_formal_ino is that, for any single inode, the same number doesn't get reused too quickly.
We already have a generation number which is kept in the inode and initialised from a counter in the resource group (almost no overhead, since we have to touch the resource group anyway in order to allocate an inode in the first place). Aside from ensuring that we never use the value 0 in the no_formal_ino field, we can use that counter directly.
As a result of that change, we lose about 200 lines of code and also gain about 10 creates/sec on the postmark benchmark (on my test machine).
--- fs/gfs2/incore.h | 7 --- fs/gfs2/inode.c | 143 +------------------------------------------------ fs/gfs2/ops_fstype.c | 45 ++-------------- fs/gfs2/rgrp.c | 2 + fs/gfs2/super.c | 3 - 5 files changed, 10 insertions(+), 190 deletions(-)
fs/gfs2/incore.h +0 -7
@@ -548,18 +548,12 @@ struct gfs2_sbd {struct dentry *sd_root_dir;struct inode *sd_jindex; -struct inode *sd_inum_inode;struct inode *sd_statfs_inode; -struct inode *sd_ir_inode;struct inode *sd_sc_inode;struct inode *sd_qc_inode;struct inode *sd_rindex;struct inode *sd_quota_inode; -/* Inum stuff */ - -struct mutex sd_inum_mutex; -/* StatFS stuff */ spinlock_t sd_statfs_spin;
@@ -587,7 +581,6 @@ struct gfs2_sbd {struct gfs2_holder sd_journal_gh;struct gfs2_holder sd_jinode_gh; -struct gfs2_holder sd_ir_gh;struct gfs2_holder sd_sc_gh;struct gfs2_holder sd_qc_gh;
fs/gfs2/inode.c +3 -140
164 lines not on this page · raw message
fs/gfs2/ops_fstype.c +5 -40
102 lines not on this page · raw message
fs/gfs2/rgrp.c +2 -0
@@ -1567,6 +1567,8 @@ int gfs2_alloc_di(struct gfs2_inode *dip, u64 *bn, u64 *generation) rgd->rd_free--; rgd->rd_dinodes++; *generation = rgd->rd_igeneration++; +if (*generation ==0 ) + *generation = rgd->rd_igeneration++;gfs2_trans_add_bh (rgd->rd_gl, rgd->rd_bits[0 ].bi_bh,1 );gfs2_rgrp_out (rgd, rgd->rd_bits[0 ].bi_bh->b_data);
fs/gfs2/super.c +0 -3
@@ -788,7 +788,6 @@ restart:/* Release stuff */ iput (sdp->sd_jindex); -iput (sdp->sd_inum_inode);iput (sdp->sd_statfs_inode);iput (sdp->sd_rindex);iput (sdp->sd_quota_inode);
@@ -799,10 +798,8 @@ restart:if (!sdp->sd_args.ar_spectator) {gfs2_glock_dq_uninit (&sdp->sd_journal_gh);gfs2_glock_dq_uninit (&sdp->sd_jinode_gh); -gfs2_glock_dq_uninit (&sdp->sd_ir_gh);gfs2_glock_dq_uninit (&sdp->sd_sc_gh);gfs2_glock_dq_uninit (&sdp->sd_qc_gh); -iput (sdp->sd_ir_inode);iput (sdp->sd_sc_inode);iput (sdp->sd_qc_inode); }
Signature · 1 line
1.6.2.5
PATCH 14/15 GFS2: Be extra careful about deallocating inodes
There is a potential race in the inode deallocation code if two nodes try to deallocate the same inode at the same time. Most of the issue is solved by the iopen locking. There is still a small window which is not covered by the iopen lock. This patches fixes that and also makes the deallocation code more robust in the face of any errors in the rgrp bitmaps, or erroneous iopen callbacks from other nodes.
This does introduce one extra disk read, but that is generally not an issue since its the same block that must be written to later in the deallocation process. The total disk accesses therefore stay the same,
--- fs/gfs2/export.c | 36 ++++-------------------------------- fs/gfs2/rgrp.c | 42 +++++++++++++++++++++++++++++++++++++++++- fs/gfs2/rgrp.h | 4 ++-- fs/gfs2/super.c | 4 ++++ 4 files changed, 51 insertions(+), 35 deletions(-)
fs/gfs2/export.c +4 -32
@@ -143,17 +143,14 @@ static struct dentry *gfs2_get_parent(struct dentry *child) }static struct dentry *gfs2_get_dentry (struct super_block *sb, -struct gfs2_inum_host *inum) +struct gfs2_inum_host *inum) {struct gfs2_sbd *sdp = sb->s_fs_info; -struct gfs2_holder i_gh, ri_gh, rgd_gh; -struct gfs2_rgrpd *rgd; +struct gfs2_holder i_gh;struct inode *inode;struct dentry *dentry;int error; -/* System files? */ - inode =gfs2_ilookup (sb, inum->no_addr);if (inode) {if (GFS2_I (inode)->i_no_formal_ino != inum->no_formal_ino) {
@@ -168,29 +165,11 @@ static struct dentry *gfs2_get_dentry(struct super_block *sb,if (error)return ERR_PTR (error); - error =gfs2_rindex_hold (sdp, &ri_gh); + error =gfs2_check_blk_type (sdp, inum->no_addr,GFS2_BLKST_DINODE );if (error) goto fail; - error = -EINVAL ; - rgd =gfs2_blk2rgrpd (sdp, inum->no_addr); -if (!rgd) - goto fail_rindex; - - error =gfs2_glock_nq_init (rgd->rd_gl,LM_ST_SHARED ,0 , &rgd_gh); -if (error) - goto fail_rindex; - - error = -ESTALE ; -if (gfs2_get_block_type (rgd, inum->no_addr) !=GFS2_BLKST_DINODE ) - goto fail_rgd; - -gfs2_glock_dq_uninit (&rgd_gh); -gfs2_glock_dq_uninit (&ri_gh); - - inode =gfs2_inode_lookup (sb,DT_UNKNOWN , - inum->no_addr, -0 ,0 ); + inode =gfs2_inode_lookup (sb,DT_UNKNOWN , inum->no_addr,0 ,0 );if (IS_ERR (inode)) { error =PTR_ERR (inode); goto fail;
@@ -224,13 +203,6 @@ out_inode:if (!IS_ERR (dentry)) dentry->d_op = &gfs2_dops;return dentry; - -fail_rgd: -gfs2_glock_dq_uninit (&rgd_gh); - -fail_rindex: -gfs2_glock_dq_uninit (&ri_gh); - fail:gfs2_glock_dq_uninit (&i_gh);return ERR_PTR (error);
fs/gfs2/rgrp.c +41 -1
54 lines not on this page · raw message
fs/gfs2/rgrp.h +2 -2
@@ -44,8 +44,6 @@ gfs2_inplace_reserve_i((ip), __FILE__, __LINE__)extern void gfs2_inplace_release (struct gfs2_inode *ip); -extern unsigned char gfs2_get_block_type (struct gfs2_rgrpd *rgd,u64 block); -extern int gfs2_alloc_block (struct gfs2_inode *ip,u64 *bn,unsigned int *n);extern int gfs2_alloc_di (struct gfs2_inode *ip,u64 *bn,u64 *generation);
@@ -53,6 +51,8 @@ extern void gfs2_free_data(struct gfs2_inode *ip, u64 bstart, u32 blen);extern void gfs2_free_meta (struct gfs2_inode *ip,u64 bstart,u32 blen);extern void gfs2_free_di (struct gfs2_rgrpd *rgd,struct gfs2_inode *ip);extern void gfs2_unlink_di (struct inode *inode); +extern int gfs2_check_blk_type (struct gfs2_sbd *sdp,u64 no_addr, +unsigned int type);struct gfs2_rgrp_list {unsigned int rl_rgrps;
fs/gfs2/super.c +4 -0
@@ -1286,6 +1286,10 @@ static void gfs2_delete_inode(struct inode *inode) goto out; } + error =gfs2_check_blk_type (sdp, ip->i_no_addr,GFS2_BLKST_UNLINKED ); +if (error) + goto out_truncate; +gfs2_glock_dq_wait (&ip->i_iopen_gh);gfs2_holder_reinit (LM_ST_EXCLUSIVE ,LM_FLAG_TRY_1CB |GL_NOCACHE , &ip->i_iopen_gh); error =gfs2_glock_nq (&ip->i_iopen_gh);
Signature · 1 line
1.6.2.5
PATCH 15/15 GFS2: Remove unused sysfs file
The /sys/fs/gfs2/<fsname>/lock_module/id file has been unused for some time now, so we can remove it. We still accept the mount option though, as userspace still sends that.
--- fs/gfs2/incore.h | 1 - fs/gfs2/ops_fstype.c | 6 +----- fs/gfs2/sys.c | 8 -------- 3 files changed, 1 insertions(+), 14 deletions(-)
fs/gfs2/incore.h +0 -1
@@ -496,7 +496,6 @@ struct gfs2_sb_host {*/ struct lm_lockstruct { -u32 ls_id;unsigned int ls_jid;unsigned int ls_first;unsigned int ls_first_done;
fs/gfs2/ops_fstype.c +1 -5
@@ -1028,7 +1028,6 @@ static int gfs2_lm_mount(struct gfs2_sbd *sdp, int silent) ls->ls_ops = lm; ls->ls_first =1 ; - ls->ls_id =0 ;for (options = args->ar_hostdata; (o =strsep (&options,":" )); ) {substring_t tmp[MAX_OPT_ARGS ];
@@ -1046,10 +1045,7 @@ static int gfs2_lm_mount(struct gfs2_sbd *sdp, int silent) ls->ls_jid = option;break ;case Opt_id: - ret =match_int (&tmp[0 ], &option); -if (ret) - goto hostdata_error; - ls->ls_id = option; +/* Obsolete, but left for backward compat purposes */ break ;case Opt_first: ret =match_int (&tmp[0 ], &option);
fs/gfs2/sys.c +0 -8
@@ -320,12 +320,6 @@ static ssize_t block_store(struct gfs2_sbd *sdp, const char *buf, size_t len)return ret; } -static ssize_t lkid_show (struct gfs2_sbd *sdp,char *buf) -{ -struct lm_lockstruct *ls = &sdp->sd_lockstruct; -return sprintf (buf,"%u\n" , ls->ls_id); -} -static ssize_t lkfirst_show (struct gfs2_sbd *sdp,char *buf) {struct lm_lockstruct *ls = &sdp->sd_lockstruct;
@@ -390,7 +384,6 @@ static struct gfs2_attr gdlm_attr_##_name = __ATTR(_name,_mode,_show,_store)GDLM_ATTR (proto_name,0444 , proto_name_show,NULL );GDLM_ATTR (block,0644 , block_show, block_store);GDLM_ATTR (withdraw,0644 , withdraw_show, withdraw_store); -GDLM_ATTR (id,0444 , lkid_show,NULL );GDLM_ATTR (jid,0444 , jid_show,NULL );GDLM_ATTR (first,0444 , lkfirst_show,NULL );GDLM_ATTR (first_done,0444 , first_done_show,NULL );
@@ -402,7 +395,6 @@ static struct attribute *lock_module_attrs[] = { &gdlm_attr_proto_name.attr, &gdlm_attr_block.attr, &gdlm_attr_withdraw.attr, - &gdlm_attr_id.attr, &gdlm_attr_jid.attr, &gdlm_attr_first.attr, &gdlm_attr_first_done.attr,
Signature · 1 line
1.6.2.5
Quoted 11 lines · Steven Whitehouse
As merge time is approaching, here is the current content of the GFS2 -nmw git tree. I'm not expecting to take any more patches now for the current merge window unless any last minute bugs are discovered.
There is not a huge amount new this time. Some extra context for uevent messages, better error handling during block allocation, and a clean up of extended attribute support. There is still more to do on the extended attribute side of things, but this is a good start I think.
Quoted 4 lines
There are a few bug fixes as well. Once these patches are merged I'm intending to start off the next -nmw tree with a patch to remove some of the (now unused) sysfs files as per the message on cluster-devel a few weeks back.
This patch set has a couple of checkpatch issues..
Patch 3,
ERROR: code indent should use tabs where possible
#83: FILE: fs/gfs2/rgrp.c:1466:
+^I (unsigned long long)rgd->rd_addr);$
Patch 11,
ERROR: trailing whitespace
#741: FILE: fs/gfs2/eattr.c:565:
+^Iif (size) $
and patch 12,
ERROR: trailing whitespace
#2349: FILE: fs/gfs2/xattr.c:565:
+^Iif (size) $
ERROR: space required after that ',' (ctx:VxV)
#2833: FILE: fs/gfs2/xattr.c:1049:
+ return ea_remove_unstuffed(ip, el->el_bh, el->el_ea, el->el_prev,0);
ERROR: code indent should use tabs where possible
#3370: FILE: fs/gfs2/xattr.h:22:
+ (sizeof(__be64) * (ea)->ea_num_ptrs)), 8)$
Could you correct these prior to you pull request?
Daniel
Hi,
Quoted 17 lines · Daniel Walker
Quoted 11 lines · Steven Whitehouse
As merge time is approaching, here is the current content of the GFS2 -nmw git tree. I'm not expecting to take any more patches now for the current merge window unless any last minute bugs are discovered.
There is not a huge amount new this time. Some extra context for uevent messages, better error handling during block allocation, and a clean up of extended attribute support. There is still more to do on the extended attribute side of things, but this is a good start I think.
Quoted 4 lines
There are a few bug fixes as well. Once these patches are merged I'm intending to start off the next -nmw tree with a patch to remove some of the (now unused) sysfs files as per the message on cluster-devel a few weeks back.
Quoted 9 lines
This patch set has a couple of checkpatch issues..
Patch 3,
ERROR: code indent should use tabs where possible
#83: FILE:fs/gfs2/rgrp.c:1466:
+^I (unsigned long long)rgd->rd_addr);$
Now fixed in the latest -nmw tree.
Quoted 6 lines
Patch 11,
ERROR: trailing whitespace
#741: FILE:fs/gfs2/eattr.c:565:
+^Iif (size) $
Quoted 6 lines
and patch 12,
ERROR: trailing whitespace
#2349: FILE:fs/gfs2/xattr.c:565:
+^Iif (size) $
This is the same line of code. There is no need to report it twice.
Quoted 4 lines
ERROR: space required after that ',' (ctx:VxV)
#2833: FILE:fs/gfs2/xattr.c:1049:
+ returnea_remove_unstuffed(ip, el->el_bh, el->el_ea, el->el_prev,0);
Quoted 8 lines
ERROR: code indent should use tabs where possible
#3370: FILE:fs/gfs2/xattr.h:22:
+ (sizeof(__be64)* (ea)->ea_num_ptrs)), 8)$Could you correct these prior to you pull request?
Daniel
The above two are both part of the context rather than something I've added. I've fixed them anyway though,
Steve.
Quoted 7 lines · Steven Whitehouse
Quoted 5 lines
ERROR: code indent should use tabs where possible
#83: FILE:fs/gfs2/rgrp.c:1466:
+^I (unsigned long long)rgd->rd_addr);$Now fixed in the latest -nmw tree.
Ok, Thank you.
Daniel