Commit 0eac1102 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'work.misc' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs 

Pull misc vfs updates from Al Viro:
 "Assorted stuff all over the place (the largest group here is
  Christoph's stat cleanups)"

* 'work.misc' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
  fs: remove KSTAT_QUERY_FLAGS
  fs: remove vfs_stat_set_lookup_flags
  fs: move vfs_fstatat out of line
  fs: implement vfs_stat and vfs_lstat in terms of vfs_fstatat
  fs: remove vfs_statx_fd
  fs: omfs: use kmemdup() rather than kmalloc+memcpy
  [PATCH] reduce boilerplate in fsid handling
  fs: Remove duplicated flag O_NDELAY occurring twice in VALID_OPEN_FLAGS
  selftests: mount: add nosymfollow tests
  Add a "nosymfollow" mount option.
parents 1b307ac8 f2d077ff

fs/9p/vfs_super.c

+1 −2
Original line number Diff line number Diff line
@@ -260,8 +260,7 @@ static int v9fs_statfs(struct dentry *dentry, struct kstatfs *buf) 
			buf->f_bavail = rs.bavail;

			buf->f_files = rs.files;

			buf->f_ffree = rs.ffree;

			buf->f_fsid.val[0] = rs.fsid & 0xFFFFFFFFUL;

			buf->f_fsid.val[1] = (rs.fsid >> 32) & 0xFFFFFFFFUL;

			buf->f_fsid = u64_to_fsid(rs.fsid);

			buf->f_namelen = rs.namelen;

		}

		if (res != -ENOSYS)

fs/adfs/super.c

+1 −2
Original line number Diff line number Diff line
@@ -210,8 +210,7 @@ static int adfs_statfs(struct dentry *dentry, struct kstatfs *buf) 
	buf->f_namelen = sbi->s_namelen;

	buf->f_bsize   = sb->s_blocksize;

	buf->f_ffree   = (long)(buf->f_bfree * buf->f_files) / (long)buf->f_blocks;

	buf->f_fsid.val[0] = (u32)id;

	buf->f_fsid.val[1] = (u32)(id >> 32);

	buf->f_fsid    = u64_to_fsid(id);



	return 0;

}

fs/affs/super.c

+1 −2
Original line number Diff line number Diff line
@@ -620,8 +620,7 @@ affs_statfs(struct dentry *dentry, struct kstatfs *buf) 
	buf->f_blocks  = AFFS_SB(sb)->s_partition_size - AFFS_SB(sb)->s_reserved;

	buf->f_bfree   = free;

	buf->f_bavail  = free;

	buf->f_fsid.val[0] = (u32)id;

	buf->f_fsid.val[1] = (u32)(id >> 32);

	buf->f_fsid    = u64_to_fsid(id);

	buf->f_namelen = AFFSNAMEMAX;

	return 0;

}

fs/befs/linuxvfs.c

+1 −2
Original line number Diff line number Diff line
@@ -963,8 +963,7 @@ befs_statfs(struct dentry *dentry, struct kstatfs *buf) 
	buf->f_bavail = buf->f_bfree;

	buf->f_files = 0;	/* UNKNOWN */

	buf->f_ffree = 0;	/* UNKNOWN */

	buf->f_fsid.val[0] = (u32)id;

	buf->f_fsid.val[1] = (u32)(id >> 32);

	buf->f_fsid = u64_to_fsid(id);

	buf->f_namelen = BEFS_NAME_LEN;



	befs_debug(sb, "<--- %s", __func__);

fs/bfs/inode.c

+1 −2
Original line number Diff line number Diff line
@@ -229,8 +229,7 @@ static int bfs_statfs(struct dentry *dentry, struct kstatfs *buf) 
	buf->f_bfree = buf->f_bavail = info->si_freeb;

	buf->f_files = info->si_lasti + 1 - BFS_ROOT_INO;

	buf->f_ffree = info->si_freei;

	buf->f_fsid.val[0] = (u32)id;

	buf->f_fsid.val[1] = (u32)(id >> 32);

	buf->f_fsid = u64_to_fsid(id);

	buf->f_namelen = BFS_NAMELEN;

	return 0;

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE