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

Commit 17637cba authored by Miklos Szeredi's avatar Miklos Szeredi Committed by Linus Torvalds
Browse files

fuse: improve utimes support 



Add two new flags for setattr: FATTR_ATIME_NOW and FATTR_MTIME_NOW.  These
mean, that atime or mtime should be changed to the current time.

Also it is now possible to update atime or mtime individually, not just
together.

Signed-off-by: default avatarMiklos Szeredi <mszeredi@suse.cz>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent d139d7ff

fs/fuse/dir.c

+25 −3
Original line number Diff line number Diff line
@@ -1014,6 +1014,20 @@ static int fuse_dir_fsync(struct file *file, struct dentry *de, int datasync) 
	return file ? fuse_fsync_common(file, de, datasync, 1) : 0;

}



static bool update_mtime(unsigned ivalid)

{

	/* Always update if mtime is explicitly set  */

	if (ivalid & ATTR_MTIME_SET)

		return true;



	/* If it's an open(O_TRUNC) or an ftruncate(), don't update */

	if ((ivalid & ATTR_SIZE) && (ivalid & (ATTR_OPEN | ATTR_FILE)))

		return false;



	/* In all other cases update */

	return true;

}



static void iattr_to_fattr(struct iattr *iattr, struct fuse_setattr_in *arg)

{

	unsigned ivalid = iattr->ia_valid;
@@ -1026,11 +1040,19 @@ static void iattr_to_fattr(struct iattr *iattr, struct fuse_setattr_in *arg) 
		arg->valid |= FATTR_GID,    arg->gid = iattr->ia_gid;

	if (ivalid & ATTR_SIZE)

		arg->valid |= FATTR_SIZE,   arg->size = iattr->ia_size;

	/* You can only _set_ these together (they may change by themselves) */

	if ((ivalid & (ATTR_ATIME | ATTR_MTIME)) == (ATTR_ATIME | ATTR_MTIME)) {

		arg->valid |= FATTR_ATIME | FATTR_MTIME;

	if (ivalid & ATTR_ATIME) {

		arg->valid |= FATTR_ATIME;

		arg->atime = iattr->ia_atime.tv_sec;

		arg->atimensec = iattr->ia_atime.tv_nsec;

		if (!(ivalid & ATTR_ATIME_SET))

			arg->valid |= FATTR_ATIME_NOW;

	}

	if ((ivalid & ATTR_MTIME) && update_mtime(ivalid)) {

		arg->valid |= FATTR_MTIME;

		arg->mtime = iattr->ia_mtime.tv_sec;

		arg->mtimensec = iattr->ia_mtime.tv_nsec;

		if (!(ivalid & ATTR_MTIME_SET))

			arg->valid |= FATTR_MTIME_NOW;

	}

}

include/linux/fuse.h

+2 −0
Original line number Diff line number Diff line
@@ -83,6 +83,8 @@ struct fuse_file_lock { 
#define FATTR_ATIME	(1 << 4)

#define FATTR_MTIME	(1 << 5)

#define FATTR_FH	(1 << 6)

#define FATTR_ATIME_NOW	(1 << 7)

#define FATTR_MTIME_NOW	(1 << 8)



/**

 * Flags returned by the OPEN request