Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e1552e19 authored by Trond Myklebust's avatar Trond Myklebust Committed by Linus Torvalds
Browse files

NFS: Fix an Oops in nfs_setattr() 



It looks like nfs_setattr() and nfs_rename() also need to test whether the
target is a regular file before calling nfs_wb_all()...

Signed-off-by: default avatarTrond Myklebust <Trond.Myklebust@netapp.com>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent c9c57929

fs/nfs/dir.c

+2 −1
Original line number Diff line number Diff line
@@ -1684,6 +1684,7 @@ static int nfs_rename(struct inode *old_dir, struct dentry *old_dentry, 
	 * ... prune child dentries and writebacks if needed.

	 */

	if (atomic_read(&old_dentry->d_count) > 1) {

		if (S_ISREG(old_inode->i_mode))

			nfs_wb_all(old_inode);

		shrink_dcache_parent(old_dentry);

	}

fs/nfs/inode.c

+4 −2
Original line number Diff line number Diff line
@@ -341,8 +341,10 @@ nfs_setattr(struct dentry *dentry, struct iattr *attr) 
	lock_kernel();

	nfs_begin_data_update(inode);

	/* Write all dirty data */

	if (S_ISREG(inode->i_mode)) {

		filemap_write_and_wait(inode->i_mapping);

		nfs_wb_all(inode);

	}

	/*

	 * Return any delegations if we're going to change ACLs

	 */