Commit 2584e798 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/ocfs2 

* 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/ocfs2:
  ocfs2/dlm: Wait on lockres instead of erroring cancel requests
  ocfs2: Add missing lock name
  ocfs2: Don't oops in ocfs2_kill_sb on a failed mount
  ocfs2: release the buffer head in ocfs2_do_truncate.
  ocfs2: Handle quota file corruption more gracefully
parents 7c0a57d5 c795b33b

fs/ocfs2/alloc.c

+1 −1
Original line number Diff line number Diff line
@@ -6851,7 +6851,7 @@ static int ocfs2_do_truncate(struct ocfs2_super *osb, 
	}

	status = 0;

bail:



	brelse(last_eb_bh);

	mlog_exit(status);

	return status;

}

fs/ocfs2/dlm/dlmunlock.c

+2 −2
Original line number Diff line number Diff line
@@ -122,7 +122,7 @@ static enum dlm_status dlmunlock_common(struct dlm_ctxt *dlm, 
	 * that still has AST's pending... */

	in_use = !list_empty(&lock->ast_list);

	spin_unlock(&dlm->ast_lock);

	if (in_use) {

	if (in_use && !(flags & LKM_CANCEL)) {

	       mlog(ML_ERROR, "lockres %.*s: Someone is calling dlmunlock "

		    "while waiting for an ast!", res->lockname.len,

		    res->lockname.name);
@@ -131,7 +131,7 @@ static enum dlm_status dlmunlock_common(struct dlm_ctxt *dlm, 


	spin_lock(&res->spinlock);

	if (res->state & DLM_LOCK_RES_IN_PROGRESS) {

		if (master_node) {

		if (master_node && !(flags & LKM_CANCEL)) {

			mlog(ML_ERROR, "lockres in progress!\n");

			spin_unlock(&res->spinlock);

			return DLM_FORWARD;

fs/ocfs2/ocfs2_lockid.h

+1 −0
Original line number Diff line number Diff line
@@ -108,6 +108,7 @@ static char *ocfs2_lock_type_strings[] = { 
	[OCFS2_LOCK_TYPE_OPEN] = "Open",

	[OCFS2_LOCK_TYPE_FLOCK] = "Flock",

	[OCFS2_LOCK_TYPE_QINFO] = "Quota",

	[OCFS2_LOCK_TYPE_NFS_SYNC] = "NFSSync",

	[OCFS2_LOCK_TYPE_ORPHAN_SCAN] = "OrphanScan",

};

fs/ocfs2/quota_global.c

+10 −0
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ 
#include "sysfile.h"

#include "dlmglue.h"

#include "uptodate.h"

#include "super.h"

#include "quota.h"



static struct workqueue_struct *ocfs2_quota_wq = NULL;
@@ -114,6 +115,15 @@ int ocfs2_read_quota_block(struct inode *inode, u64 v_block, 
	int rc = 0;

	struct buffer_head *tmp = *bh;



	if (i_size_read(inode) >> inode->i_sb->s_blocksize_bits <= v_block) {

		ocfs2_error(inode->i_sb,

			    "Quota file %llu is probably corrupted! Requested "

			    "to read block %Lu but file has size only %Lu\n",

			    (unsigned long long)OCFS2_I(inode)->ip_blkno,

			    (unsigned long long)v_block,

			    (unsigned long long)i_size_read(inode));

		return -EIO;

	}

	rc = ocfs2_read_virt_blocks(inode, v_block, 1, &tmp, 0,

				    ocfs2_validate_quota_block);

	if (rc)

fs/ocfs2/super.c

+5 −1
Original line number Diff line number Diff line
@@ -1218,13 +1218,17 @@ static void ocfs2_kill_sb(struct super_block *sb) 
{

	struct ocfs2_super *osb = OCFS2_SB(sb);



	/* Failed mount? */

	if (!osb || atomic_read(&osb->vol_state) == VOLUME_DISABLED)

		goto out;



	/* Prevent further queueing of inode drop events */

	spin_lock(&dentry_list_lock);

	ocfs2_set_osb_flag(osb, OCFS2_OSB_DROP_DENTRY_LOCK_IMMED);

	spin_unlock(&dentry_list_lock);

	/* Wait for work to finish and/or remove it */

	cancel_work_sync(&osb->dentry_lock_work);



out:

	kill_block_super(sb);

}