Commit 5e7f1d43 authored by Martin Brandenburg's avatar Martin Brandenburg Committed by Mike Marshall
Browse files

orangefs: update attributes rather than relying on server 



This should be a no-op now, but once inode writeback works, it'll be
necessary to have the correct attribute in the dirty inode.

Previously the attribute fetch timeout was marked invalid and the server
provided the updated attribute.  When the inode is dirty, the server
cannot be consulted since it does not yet know the pending setattr.

Signed-off-by: default avatarMartin Brandenburg <martin@omnibond.com>
Signed-off-by: default avatarMike Marshall <hubcap@omnibond.com>
parent 8b60785c

fs/orangefs/file.c

+2 −8
Original line number Diff line number Diff line
@@ -327,14 +327,8 @@ out: 
			file_accessed(file);

		} else {

			file_update_time(file);

			/*

			 * Must invalidate to ensure write loop doesn't

			 * prevent kernel from reading updated

			 * attribute.  Size probably changed because of

			 * the write, and other clients could update

			 * any other attribute.

			 */

			orangefs_inode->getattr_time = jiffies - 1;

			if (*offset > i_size_read(inode))

				i_size_write(inode, *offset);

		}

	}

fs/orangefs/namei.c

+6 −1
Original line number Diff line number Diff line
@@ -383,6 +383,7 @@ static int orangefs_rename(struct inode *old_dir, 
			unsigned int flags)

{

	struct orangefs_kernel_op_s *new_op;

	struct iattr iattr;

	int ret;



	if (flags)
@@ -392,7 +393,11 @@ static int orangefs_rename(struct inode *old_dir, 
		     "orangefs_rename: called (%pd2 => %pd2) ct=%d\n",

		     old_dentry, new_dentry, d_count(new_dentry));



	ORANGEFS_I(new_dentry->d_parent->d_inode)->getattr_time = jiffies - 1;

	new_dir->i_mtime = new_dir->i_ctime = current_time(new_dir);

	memset(&iattr, 0, sizeof iattr);

	iattr.ia_valid |= ATTR_MTIME;

	orangefs_inode_setattr(new_dir, &iattr);

	mark_inode_dirty_sync(new_dir);



	new_op = op_alloc(ORANGEFS_VFS_OP_RENAME);

	if (!new_op)

CRA Git | Maintained and supported by SUSTech CRA and CCSE