mirror of
https://mirrors.bfsu.edu.cn/git/linux.git
synced 2024-09-22 04:31:58 +08:00
7a932516f5
This is a late set of changes from Deepa Dinamani doing an automated
treewide conversion of the inode and iattr structures from 'timespec'
to 'timespec64', to push the conversion from the VFS layer into the
individual file systems.
There were no conflicts between this and the contents of linux-next
until just before the merge window, when we saw multiple problems:
- A minor conflict with my own y2038 fixes, which I could address
by adding another patch on top here.
- One semantic conflict with late changes to the NFS tree. I addressed
this by merging Deepa's original branch on top of the changes that
now got merged into mainline and making sure the merge commit includes
the necessary changes as produced by coccinelle.
- A trivial conflict against the removal of staging/lustre.
- Multiple conflicts against the VFS changes in the overlayfs tree.
These are still part of linux-next, but apparently this is no longer
intended for 4.18 [1], so I am ignoring that part.
As Deepa writes:
The series aims to switch vfs timestamps to use struct timespec64.
Currently vfs uses struct timespec, which is not y2038 safe.
The series involves the following:
1. Add vfs helper functions for supporting struct timepec64 timestamps.
2. Cast prints of vfs timestamps to avoid warnings after the switch.
3. Simplify code using vfs timestamps so that the actual
replacement becomes easy.
4. Convert vfs timestamps to use struct timespec64 using a script.
This is a flag day patch.
Next steps:
1. Convert APIs that can handle timespec64, instead of converting
timestamps at the boundaries.
2. Update internal data structures to avoid timestamp conversions.
Thomas Gleixner adds:
I think there is no point to drag that out for the next merge window.
The whole thing needs to be done in one go for the core changes which
means that you're going to play that catchup game forever. Let's get
over with it towards the end of the merge window.
[1] https://www.spinics.net/lists/linux-fsdevel/msg128294.html
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1
iQIcBAABAgAGBQJbInZAAAoJEGCrR//JCVInReoQAIlVIIMt5ZX6wmaKbrjy9Itf
MfgbFihQ/djLnuSPVQ3nztcxF0d66BKHZ9puVjz6+mIHqfDvJTRwZs9nU+sOF/T1
g78fRkM1cxq6ZCkGYAbzyjyo5aC4PnSMP/NQLmwqvi0MXqqrbDoq5ZdP9DHJw39h
L9lD8FM/P7T29Fgp9tq/pT5l9X8VU8+s5KQG1uhB5hii4VL6pD6JyLElDita7rg+
Z7/V7jkxIGEUWF7vGaiR1QTFzEtpUA/exDf9cnsf51OGtK/LJfQ0oiZPPuq3oA/E
LSbt8YQQObc+dvfnGxwgxEg1k5WP5ekj/Wdibv/+rQKgGyLOTz6Q4xK6r8F2ahxs
nyZQBdXqHhJYyKr1H1reUH3mrSgQbE5U5R1i3My0xV2dSn+vtK5vgF21v2Ku3A1G
wJratdtF/kVBzSEQUhsYTw14Un+xhBLRWzcq0cELonqxaKvRQK9r92KHLIWNE7/v
c0TmhFbkZA+zR8HdsaL3iYf1+0W/eYy8PcvepyldKNeW2pVk3CyvdTfY2Z87G2XK
tIkK+BUWbG3drEGG3hxZ3757Ln3a9qWyC5ruD3mBVkuug/wekbI8PykYJS7Mx4s/
WNXl0dAL0Eeu1M8uEJejRAe1Q3eXoMWZbvCYZc+wAm92pATfHVcKwPOh8P7NHlfy
A3HkjIBrKW5AgQDxfgvm
=CZX2
-----END PGP SIGNATURE-----
Merge tag 'vfs-timespec64' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/playground
Pull inode timestamps conversion to timespec64 from Arnd Bergmann:
"This is a late set of changes from Deepa Dinamani doing an automated
treewide conversion of the inode and iattr structures from 'timespec'
to 'timespec64', to push the conversion from the VFS layer into the
individual file systems.
As Deepa writes:
'The series aims to switch vfs timestamps to use struct timespec64.
Currently vfs uses struct timespec, which is not y2038 safe.
The series involves the following:
1. Add vfs helper functions for supporting struct timepec64
timestamps.
2. Cast prints of vfs timestamps to avoid warnings after the switch.
3. Simplify code using vfs timestamps so that the actual replacement
becomes easy.
4. Convert vfs timestamps to use struct timespec64 using a script.
This is a flag day patch.
Next steps:
1. Convert APIs that can handle timespec64, instead of converting
timestamps at the boundaries.
2. Update internal data structures to avoid timestamp conversions'
Thomas Gleixner adds:
'I think there is no point to drag that out for the next merge
window. The whole thing needs to be done in one go for the core
changes which means that you're going to play that catchup game
forever. Let's get over with it towards the end of the merge window'"
* tag 'vfs-timespec64' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/playground:
pstore: Remove bogus format string definition
vfs: change inode times to use struct timespec64
pstore: Convert internal records to timespec64
udf: Simplify calls to udf_disk_stamp_to_time
fs: nfs: get rid of memcpys for inode times
ceph: make inode time prints to be long long
lustre: Use long long type to print inode time
fs: add timespec64_truncate()
261 lines
8.7 KiB
C
261 lines
8.7 KiB
C
/* SPDX-License-Identifier: GPL-2.0 */
|
|
#ifndef __UDF_DECL_H
|
|
#define __UDF_DECL_H
|
|
|
|
#define pr_fmt(fmt) "UDF-fs: " fmt
|
|
|
|
#include "ecma_167.h"
|
|
#include "osta_udf.h"
|
|
|
|
#include <linux/fs.h>
|
|
#include <linux/types.h>
|
|
#include <linux/buffer_head.h>
|
|
#include <linux/udf_fs_i.h>
|
|
|
|
#include "udf_sb.h"
|
|
#include "udfend.h"
|
|
#include "udf_i.h"
|
|
|
|
#define UDF_DEFAULT_PREALLOC_BLOCKS 8
|
|
|
|
extern __printf(3, 4) void _udf_err(struct super_block *sb,
|
|
const char *function, const char *fmt, ...);
|
|
#define udf_err(sb, fmt, ...) \
|
|
_udf_err(sb, __func__, fmt, ##__VA_ARGS__)
|
|
|
|
extern __printf(3, 4) void _udf_warn(struct super_block *sb,
|
|
const char *function, const char *fmt, ...);
|
|
#define udf_warn(sb, fmt, ...) \
|
|
_udf_warn(sb, __func__, fmt, ##__VA_ARGS__)
|
|
|
|
#define udf_info(fmt, ...) \
|
|
pr_info("INFO " fmt, ##__VA_ARGS__)
|
|
|
|
#undef UDFFS_DEBUG
|
|
|
|
#ifdef UDFFS_DEBUG
|
|
#define udf_debug(fmt, ...) \
|
|
printk(KERN_DEBUG pr_fmt("%s:%d:%s: " fmt), \
|
|
__FILE__, __LINE__, __func__, ##__VA_ARGS__)
|
|
#else
|
|
#define udf_debug(fmt, ...) \
|
|
no_printk(fmt, ##__VA_ARGS__)
|
|
#endif
|
|
|
|
#define udf_fixed_to_variable(x) ( ( ( (x) >> 5 ) * 39 ) + ( (x) & 0x0000001F ) )
|
|
#define udf_variable_to_fixed(x) ( ( ( (x) / 39 ) << 5 ) + ( (x) % 39 ) )
|
|
|
|
#define UDF_EXTENT_LENGTH_MASK 0x3FFFFFFF
|
|
#define UDF_EXTENT_FLAG_MASK 0xC0000000
|
|
|
|
#define UDF_INVALID_ID ((uint32_t)-1)
|
|
|
|
#define UDF_NAME_PAD 4
|
|
#define UDF_NAME_LEN 254
|
|
#define UDF_NAME_LEN_CS0 255
|
|
|
|
static inline size_t udf_file_entry_alloc_offset(struct inode *inode)
|
|
{
|
|
struct udf_inode_info *iinfo = UDF_I(inode);
|
|
if (iinfo->i_use)
|
|
return sizeof(struct unallocSpaceEntry);
|
|
else if (iinfo->i_efe)
|
|
return sizeof(struct extendedFileEntry) + iinfo->i_lenEAttr;
|
|
else
|
|
return sizeof(struct fileEntry) + iinfo->i_lenEAttr;
|
|
}
|
|
|
|
static inline size_t udf_ext0_offset(struct inode *inode)
|
|
{
|
|
if (UDF_I(inode)->i_alloc_type == ICBTAG_FLAG_AD_IN_ICB)
|
|
return udf_file_entry_alloc_offset(inode);
|
|
else
|
|
return 0;
|
|
}
|
|
|
|
/* computes tag checksum */
|
|
u8 udf_tag_checksum(const struct tag *t);
|
|
|
|
typedef uint32_t udf_pblk_t;
|
|
|
|
struct dentry;
|
|
struct inode;
|
|
struct task_struct;
|
|
struct buffer_head;
|
|
struct super_block;
|
|
|
|
extern const struct export_operations udf_export_ops;
|
|
extern const struct inode_operations udf_dir_inode_operations;
|
|
extern const struct file_operations udf_dir_operations;
|
|
extern const struct inode_operations udf_file_inode_operations;
|
|
extern const struct file_operations udf_file_operations;
|
|
extern const struct inode_operations udf_symlink_inode_operations;
|
|
extern const struct address_space_operations udf_aops;
|
|
extern const struct address_space_operations udf_adinicb_aops;
|
|
extern const struct address_space_operations udf_symlink_aops;
|
|
|
|
struct udf_fileident_bh {
|
|
struct buffer_head *sbh;
|
|
struct buffer_head *ebh;
|
|
int soffset;
|
|
int eoffset;
|
|
};
|
|
|
|
struct udf_vds_record {
|
|
uint32_t block;
|
|
uint32_t volDescSeqNum;
|
|
};
|
|
|
|
struct generic_desc {
|
|
struct tag descTag;
|
|
__le32 volDescSeqNum;
|
|
};
|
|
|
|
|
|
/* super.c */
|
|
|
|
static inline void udf_updated_lvid(struct super_block *sb)
|
|
{
|
|
struct buffer_head *bh = UDF_SB(sb)->s_lvid_bh;
|
|
|
|
BUG_ON(!bh);
|
|
WARN_ON_ONCE(((struct logicalVolIntegrityDesc *)
|
|
bh->b_data)->integrityType !=
|
|
cpu_to_le32(LVID_INTEGRITY_TYPE_OPEN));
|
|
UDF_SB(sb)->s_lvid_dirty = 1;
|
|
}
|
|
extern u64 lvid_get_unique_id(struct super_block *sb);
|
|
struct inode *udf_find_metadata_inode_efe(struct super_block *sb,
|
|
u32 meta_file_loc, u32 partition_num);
|
|
|
|
/* namei.c */
|
|
extern int udf_write_fi(struct inode *inode, struct fileIdentDesc *,
|
|
struct fileIdentDesc *, struct udf_fileident_bh *,
|
|
uint8_t *, uint8_t *);
|
|
|
|
/* file.c */
|
|
extern long udf_ioctl(struct file *, unsigned int, unsigned long);
|
|
/* inode.c */
|
|
extern struct inode *__udf_iget(struct super_block *, struct kernel_lb_addr *,
|
|
bool hidden_inode);
|
|
static inline struct inode *udf_iget_special(struct super_block *sb,
|
|
struct kernel_lb_addr *ino)
|
|
{
|
|
return __udf_iget(sb, ino, true);
|
|
}
|
|
static inline struct inode *udf_iget(struct super_block *sb,
|
|
struct kernel_lb_addr *ino)
|
|
{
|
|
return __udf_iget(sb, ino, false);
|
|
}
|
|
extern int udf_expand_file_adinicb(struct inode *);
|
|
extern struct buffer_head *udf_expand_dir_adinicb(struct inode *inode,
|
|
udf_pblk_t *block, int *err);
|
|
extern struct buffer_head *udf_bread(struct inode *inode, udf_pblk_t block,
|
|
int create, int *err);
|
|
extern int udf_setsize(struct inode *, loff_t);
|
|
extern void udf_evict_inode(struct inode *);
|
|
extern int udf_write_inode(struct inode *, struct writeback_control *wbc);
|
|
extern udf_pblk_t udf_block_map(struct inode *inode, sector_t block);
|
|
extern int8_t inode_bmap(struct inode *, sector_t, struct extent_position *,
|
|
struct kernel_lb_addr *, uint32_t *, sector_t *);
|
|
extern int udf_setup_indirect_aext(struct inode *inode, udf_pblk_t block,
|
|
struct extent_position *epos);
|
|
extern int __udf_add_aext(struct inode *inode, struct extent_position *epos,
|
|
struct kernel_lb_addr *eloc, uint32_t elen, int inc);
|
|
extern int udf_add_aext(struct inode *, struct extent_position *,
|
|
struct kernel_lb_addr *, uint32_t, int);
|
|
extern void udf_write_aext(struct inode *, struct extent_position *,
|
|
struct kernel_lb_addr *, uint32_t, int);
|
|
extern int8_t udf_delete_aext(struct inode *, struct extent_position,
|
|
struct kernel_lb_addr, uint32_t);
|
|
extern int8_t udf_next_aext(struct inode *, struct extent_position *,
|
|
struct kernel_lb_addr *, uint32_t *, int);
|
|
extern int8_t udf_current_aext(struct inode *, struct extent_position *,
|
|
struct kernel_lb_addr *, uint32_t *, int);
|
|
|
|
/* misc.c */
|
|
extern struct buffer_head *udf_tgetblk(struct super_block *sb,
|
|
udf_pblk_t block);
|
|
extern struct buffer_head *udf_tread(struct super_block *sb, udf_pblk_t block);
|
|
extern struct genericFormat *udf_add_extendedattr(struct inode *, uint32_t,
|
|
uint32_t, uint8_t);
|
|
extern struct genericFormat *udf_get_extendedattr(struct inode *, uint32_t,
|
|
uint8_t);
|
|
extern struct buffer_head *udf_read_tagged(struct super_block *, uint32_t,
|
|
uint32_t, uint16_t *);
|
|
extern struct buffer_head *udf_read_ptagged(struct super_block *,
|
|
struct kernel_lb_addr *, uint32_t,
|
|
uint16_t *);
|
|
extern void udf_update_tag(char *, int);
|
|
extern void udf_new_tag(char *, uint16_t, uint16_t, uint16_t, uint32_t, int);
|
|
|
|
/* lowlevel.c */
|
|
extern unsigned int udf_get_last_session(struct super_block *);
|
|
extern unsigned long udf_get_last_block(struct super_block *);
|
|
|
|
/* partition.c */
|
|
extern uint32_t udf_get_pblock(struct super_block *, uint32_t, uint16_t,
|
|
uint32_t);
|
|
extern uint32_t udf_get_pblock_virt15(struct super_block *, uint32_t, uint16_t,
|
|
uint32_t);
|
|
extern uint32_t udf_get_pblock_virt20(struct super_block *, uint32_t, uint16_t,
|
|
uint32_t);
|
|
extern uint32_t udf_get_pblock_spar15(struct super_block *, uint32_t, uint16_t,
|
|
uint32_t);
|
|
extern uint32_t udf_get_pblock_meta25(struct super_block *, uint32_t, uint16_t,
|
|
uint32_t);
|
|
extern int udf_relocate_blocks(struct super_block *, long, long *);
|
|
|
|
static inline uint32_t
|
|
udf_get_lb_pblock(struct super_block *sb, struct kernel_lb_addr *loc,
|
|
uint32_t offset)
|
|
{
|
|
return udf_get_pblock(sb, loc->logicalBlockNum,
|
|
loc->partitionReferenceNum, offset);
|
|
}
|
|
|
|
/* unicode.c */
|
|
extern int udf_get_filename(struct super_block *, const uint8_t *, int,
|
|
uint8_t *, int);
|
|
extern int udf_put_filename(struct super_block *, const uint8_t *, int,
|
|
uint8_t *, int);
|
|
extern int udf_dstrCS0toChar(struct super_block *, uint8_t *, int,
|
|
const uint8_t *, int);
|
|
|
|
/* ialloc.c */
|
|
extern void udf_free_inode(struct inode *);
|
|
extern struct inode *udf_new_inode(struct inode *, umode_t);
|
|
|
|
/* truncate.c */
|
|
extern void udf_truncate_tail_extent(struct inode *);
|
|
extern void udf_discard_prealloc(struct inode *);
|
|
extern void udf_truncate_extents(struct inode *);
|
|
|
|
/* balloc.c */
|
|
extern void udf_free_blocks(struct super_block *, struct inode *,
|
|
struct kernel_lb_addr *, uint32_t, uint32_t);
|
|
extern int udf_prealloc_blocks(struct super_block *, struct inode *, uint16_t,
|
|
uint32_t, uint32_t);
|
|
extern udf_pblk_t udf_new_block(struct super_block *sb, struct inode *inode,
|
|
uint16_t partition, uint32_t goal, int *err);
|
|
|
|
/* directory.c */
|
|
extern struct fileIdentDesc *udf_fileident_read(struct inode *, loff_t *,
|
|
struct udf_fileident_bh *,
|
|
struct fileIdentDesc *,
|
|
struct extent_position *,
|
|
struct kernel_lb_addr *, uint32_t *,
|
|
sector_t *);
|
|
extern struct fileIdentDesc *udf_get_fileident(void *buffer, int bufsize,
|
|
int *offset);
|
|
extern struct long_ad *udf_get_filelongad(uint8_t *, int, uint32_t *, int);
|
|
extern struct short_ad *udf_get_fileshortad(uint8_t *, int, uint32_t *, int);
|
|
|
|
/* udftime.c */
|
|
extern void udf_disk_stamp_to_time(struct timespec *dest,
|
|
struct timestamp src);
|
|
extern void udf_time_to_disk_stamp(struct timestamp *dest, struct timespec src);
|
|
|
|
#endif /* __UDF_DECL_H */
|