GFS2: Pre-pull patch posting
Here are three small (but important!) fixes to GFS2.
Steve.
PATCH 1/3 GFS2: do not select QUOTA
From: Christoph Hellwig <[email protected]>
gfs2 only needs the quotactl code, not the generic quota implementation.
--- fs/gfs2/Kconfig | 1 - 1 files changed, 0 insertions(+), 1 deletions(-)
fs/gfs2/Kconfig +0 -1
@@ -8,7 +8,6 @@ config GFS2_FS select FS_POSIX_ACL select CRC32 select SLOW_WORK - select QUOTA select QUOTACTL help A cluster filesystem.
Signature · 1 line
1.6.2.5
PATCH 2/3 GFS2: Allow the number of committed revokes to temporarily be negative
From: Benjamin Marzinski <[email protected]>
GFS2 tracks the number of revokes and unrevokes that are part of committed transactions via sd_log_commited_revoke. It is possible for one process to add revokes during its transaction, while another process unrevokes them during its transaction. If the second process finishes its transaction first, sd_log_commited_revoke will be decremented by the number of unrevokes that the second process did, without first being incremented by the number of revokes the first process did. This is fine, since all started transactions must be completed before the journal can be flushed. However, sd_log_commited_revoke is an unsigned integer, and log_refund() causes an assertion failure if it would go negative at the end of a transaction. This patch makes sd_log_commited_revoke a signed integer and allows it to go negative. __gfs2_log_flush() still checks that it mataches the actual number of revokes.
--- fs/gfs2/incore.h | 2 +- fs/gfs2/log.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-)
fs/gfs2/incore.h +1 -1
@@ -616,7 +616,7 @@ struct gfs2_sbd {unsigned int sd_log_blks_reserved;unsigned int sd_log_commited_buf;unsigned int sd_log_commited_databuf; -unsigned int sd_log_commited_revoke; +int sd_log_commited_revoke;unsigned int sd_log_num_buf;unsigned int sd_log_num_revoke;
fs/gfs2/log.c +1 -2
@@ -417,7 +417,7 @@ static unsigned int calc_reserved(struct gfs2_sbd *sdp) databufhdrs_needed = (sdp->sd_log_commited_databuf + (dbuf_limit -1 )) / dbuf_limit; -if (sdp->sd_log_commited_revoke) +if (sdp->sd_log_commited_revoke >0 ) revokes =gfs2_struct2blk (sdp, sdp->sd_log_commited_revoke,sizeof (u64));
@@ -790,7 +790,6 @@ static void log_refund(struct gfs2_sbd *sdp, struct gfs2_trans *tr)gfs2_assert_withdraw (sdp, (((int )sdp->sd_log_commited_buf) >=0 ) || (((int )sdp->sd_log_commited_databuf) >=0 )); sdp->sd_log_commited_revoke += tr->tr_num_revoke - tr->tr_num_revoke_rm; -gfs2_assert_withdraw (sdp, ((int )sdp->sd_log_commited_revoke) >=0 ); reserved =calc_reserved (sdp);gfs2_assert_withdraw (sdp, sdp->sd_log_blks_reserved + tr->tr_reserved >= reserved); unused = sdp->sd_log_blks_reserved - reserved + tr->tr_reserved;
Signature · 1 line
1.6.2.5
PATCH 3/3 GFS2: Skip check for mandatory locks when unlocking
From: Sachin Prabhu <[email protected]>
gfs2_lock() will skip locks on file which have mode set to 02666. This is a problem in cases where the mode of the file is changed after a process has obtained a lock on the file. Such a lock will be skipped and will result in a BUG in locks_remove_flock().
gfs2_lock() should skip the check for mandatory locks when unlocking a file.
--- fs/gfs2/file.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
fs/gfs2/file.c +1 -1
@@ -640,7 +640,7 @@ static int gfs2_lock(struct file *file, int cmd, struct file_lock *fl)if (!(fl->fl_flags &FL_POSIX ))return -ENOLCK ; -if (__mandatory_lock (&ip->i_inode)) +if (__mandatory_lock (&ip->i_inode) && fl->fl_type !=F_UNLCK )return -ENOLCK ;if (cmd ==F_CANCELLK ) {
Signature · 1 line
1.6.2.5