Commit f61ec2c9 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'afs-fixes-20171124' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs 

Pull AFS fixes from David Howells:

 - Make AFS file locking work again.

 - Don't write to a page that's being written out, but wait for it to
   complete.

 - Do d_drop() and d_add() in the right places.

 - Put keys on error paths.

 - Remove some redundant code.

* tag 'afs-fixes-20171124' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs:
  afs: remove redundant assignment of dvnode to itself
  afs: cell: Remove unnecessary code in afs_lookup_cell
  afs: Fix signal handling in some file ops
  afs: Fix some dentry handling in dir ops and missing key_puts
  afs: Make afs_write_begin() avoid writing to a page that's being stored
  afs: Fix file locking
parents 7753ea09 43dd388b

fs/afs/cell.c

+1 −6
Original line number Diff line number Diff line
@@ -207,14 +207,9 @@ struct afs_cell *afs_lookup_cell(struct afs_net *net, 
		rcu_read_lock();

		cell = afs_lookup_cell_rcu(net, name, namesz);

		rcu_read_unlock();

		if (!IS_ERR(cell)) {

			if (excl) {

				afs_put_cell(net, cell);

				return ERR_PTR(-EEXIST);

			}

		if (!IS_ERR(cell))

			goto wait_for_cell;

	}

	}



	/* Assume we're probably going to create a cell and preallocate and

	 * mostly set up a candidate record.  We can then use this to stash the

fs/afs/dir.c

+14 −11
Original line number Diff line number Diff line
@@ -765,6 +765,8 @@ static void afs_vnode_new_inode(struct afs_fs_cursor *fc, 
	if (fc->ac.error < 0)

		return;



	d_drop(new_dentry);



	inode = afs_iget(fc->vnode->vfs_inode.i_sb, fc->key,

			 newfid, newstatus, newcb, fc->cbi);

	if (IS_ERR(inode)) {
@@ -775,9 +777,7 @@ static void afs_vnode_new_inode(struct afs_fs_cursor *fc, 
		return;

	}



	d_instantiate(new_dentry, inode);

	if (d_unhashed(new_dentry))

		d_rehash(new_dentry);

	d_add(new_dentry, inode);

}



/*
@@ -818,6 +818,8 @@ static int afs_mkdir(struct inode *dir, struct dentry *dentry, umode_t mode) 
		ret = afs_end_vnode_operation(&fc);

		if (ret < 0)

			goto error_key;

	} else {

		goto error_key;

	}



	key_put(key);
@@ -972,7 +974,7 @@ static int afs_create(struct inode *dir, struct dentry *dentry, umode_t mode, 
	struct afs_fs_cursor fc;

	struct afs_file_status newstatus;

	struct afs_callback newcb;

	struct afs_vnode *dvnode = dvnode = AFS_FS_I(dir);

	struct afs_vnode *dvnode = AFS_FS_I(dir);

	struct afs_fid newfid;

	struct key *key;

	int ret;
@@ -1006,6 +1008,8 @@ static int afs_create(struct inode *dir, struct dentry *dentry, umode_t mode, 
		ret = afs_end_vnode_operation(&fc);

		if (ret < 0)

			goto error_key;

	} else {

		goto error_key;

	}



	key_put(key);
@@ -1053,7 +1057,7 @@ static int afs_link(struct dentry *from, struct inode *dir, 
	if (afs_begin_vnode_operation(&fc, dvnode, key)) {

		if (mutex_lock_interruptible_nested(&vnode->io_lock, 1) < 0) {

			afs_end_vnode_operation(&fc);

			return -ERESTARTSYS;

			goto error_key;

		}



		while (afs_select_fileserver(&fc)) {
@@ -1071,6 +1075,8 @@ static int afs_link(struct dentry *from, struct inode *dir, 
		ret = afs_end_vnode_operation(&fc);

		if (ret < 0)

			goto error_key;

	} else {

		goto error_key;

	}



	key_put(key);
@@ -1130,6 +1136,8 @@ static int afs_symlink(struct inode *dir, struct dentry *dentry, 
		ret = afs_end_vnode_operation(&fc);

		if (ret < 0)

			goto error_key;

	} else {

		goto error_key;

	}



	key_put(key);
@@ -1180,7 +1188,7 @@ static int afs_rename(struct inode *old_dir, struct dentry *old_dentry, 
		if (orig_dvnode != new_dvnode) {

			if (mutex_lock_interruptible_nested(&new_dvnode->io_lock, 1) < 0) {

				afs_end_vnode_operation(&fc);

				return -ERESTARTSYS;

				goto error_key;

			}

		}

		while (afs_select_fileserver(&fc)) {
@@ -1199,14 +1207,9 @@ static int afs_rename(struct inode *old_dir, struct dentry *old_dentry, 
			goto error_key;

	}



	key_put(key);

	_leave(" = 0");

	return 0;



error_key:

	key_put(key);

error:

	d_drop(new_dentry);

	_leave(" = %d", ret);

	return ret;

}

fs/afs/flock.c

+310 −238

File changed.

Preview size limit exceeded, changes collapsed.

fs/afs/internal.h

+16 −7

File changed.

Preview size limit exceeded, changes collapsed.

fs/afs/rotate.c

+56 −14
Original line number Diff line number Diff line
@@ -46,8 +46,7 @@ bool afs_begin_vnode_operation(struct afs_fs_cursor *fc, struct afs_vnode *vnode 
		return false;

	}



	if (test_bit(AFS_VNODE_READLOCKED, &vnode->flags) ||

	    test_bit(AFS_VNODE_WRITELOCKED, &vnode->flags))

	if (vnode->lock_state != AFS_VNODE_LOCK_NONE)

		fc->flags |= AFS_FS_CURSOR_CUR_ONLY;

	return true;

}
@@ -438,14 +437,20 @@ bool afs_select_current_fileserver(struct afs_fs_cursor *fc) 


	_enter("");



	switch (fc->ac.error) {

	case SHRT_MAX:

		if (!cbi) {

			fc->ac.error = -ESTALE;

			fc->flags |= AFS_FS_CURSOR_STOP;

			return false;

		}



		fc->cbi = afs_get_cb_interest(vnode->cb_interest);



		read_lock(&cbi->server->fs_lock);

	alist = afs_get_addrlist(cbi->server->addresses);

		alist = rcu_dereference_protected(cbi->server->addresses,

						  lockdep_is_held(&cbi->server->fs_lock));

		afs_get_addrlist(alist);

		read_unlock(&cbi->server->fs_lock);

		if (!alist) {

			fc->ac.error = -ESTALE;
@@ -454,10 +459,47 @@ bool afs_select_current_fileserver(struct afs_fs_cursor *fc) 
		}



		fc->ac.alist = alist;

		fc->ac.addr  = NULL;

		fc->ac.start = READ_ONCE(alist->index);

		fc->ac.index = fc->ac.start;

		fc->ac.error = 0;

		fc->ac.begun = false;

		goto iterate_address;



	case 0:

	default:

		/* Success or local failure.  Stop. */

		fc->flags |= AFS_FS_CURSOR_STOP;

		_leave(" = f [okay/local %d]", fc->ac.error);

		return false;



	case -ECONNABORTED:

		fc->flags |= AFS_FS_CURSOR_STOP;

		_leave(" = f [abort]");

		return false;



	case -ENETUNREACH:

	case -EHOSTUNREACH:

	case -ECONNREFUSED:

	case -ETIMEDOUT:

	case -ETIME:

		_debug("no conn");

		goto iterate_address;

	}



iterate_address:

	/* Iterate over the current server's address list to try and find an

	 * address on which it will respond to us.

	 */

	if (afs_iterate_addresses(&fc->ac)) {

		_leave(" = t");

		return true;

	}



	afs_end_cursor(&fc->ac);

	return false;

}



/*

 * Tidy up a filesystem cursor and unlock the vnode.

 */

CRA Git | Maintained and supported by SUSTech CRA and CCSE