Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
Pull vfs pile 1 from Al Viro: "This is _not_ all; in particular, Miklos' and Jan's stuff is not there yet." * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs: (64 commits) ext4: initialization of ext4_li_mtx needs to be done earlier debugfs-related mode_t whack-a-mole hfsplus: add an ioctl to bless files hfsplus: change finder_info to u32 hfsplus: initialise userflags qnx4: new helper - try_extent() qnx4: get rid of qnx4_bread/qnx4_getblk take removal of PF_FORKNOEXEC to flush_old_exec() trim includes in inode.c um: uml_dup_mmap() relies on ->mmap_sem being held, but activate_mm() doesn't hold it um: embed ->stub_pages[] into mmu_context gadgetfs: list_for_each_safe() misuse ocfs2: fix leaks on failure exits in module_init ecryptfs: make register_filesystem() the last potential failure exit ntfs: forgets to unregister sysctls on register_filesystem() failure logfs: missing cleanup on register_filesystem() failure jfs: mising cleanup on register_filesystem() failure make configfs_pin_fs() return root dentry on success configfs: configfs_create_dir() has parent dentry in dentry->d_parent configfs: sanitize configfs_create() ...
This commit is contained in:
Linus Torvalds
@@ -684,7 +684,7 @@ extern void audit_log_untrustedstring(struct audit_buffer *ab,
|
||||
const char *string);
|
||||
extern void audit_log_d_path(struct audit_buffer *ab,
|
||||
const char *prefix,
|
||||
struct path *path);
|
||||
const struct path *path);
|
||||
extern void audit_log_key(struct audit_buffer *ab,
|
||||
char *key);
|
||||
extern void audit_log_lost(const char *message);
|
||||
|
||||
@@ -92,17 +92,17 @@ struct linux_binfmt {
|
||||
unsigned long min_coredump; /* minimal dump size */
|
||||
};
|
||||
|
||||
extern int __register_binfmt(struct linux_binfmt *fmt, int insert);
|
||||
extern void __register_binfmt(struct linux_binfmt *fmt, int insert);
|
||||
|
||||
/* Registration of default binfmt handlers */
|
||||
static inline int register_binfmt(struct linux_binfmt *fmt)
|
||||
static inline void register_binfmt(struct linux_binfmt *fmt)
|
||||
{
|
||||
return __register_binfmt(fmt, 0);
|
||||
__register_binfmt(fmt, 0);
|
||||
}
|
||||
/* Same as above, but adds a new binfmt at the top of the list */
|
||||
static inline int insert_binfmt(struct linux_binfmt *fmt)
|
||||
static inline void insert_binfmt(struct linux_binfmt *fmt)
|
||||
{
|
||||
return __register_binfmt(fmt, 1);
|
||||
__register_binfmt(fmt, 1);
|
||||
}
|
||||
|
||||
extern void unregister_binfmt(struct linux_binfmt *);
|
||||
|
||||
@@ -222,7 +222,6 @@ extern void shrink_dcache_for_umount(struct super_block *);
|
||||
extern int d_invalidate(struct dentry *);
|
||||
|
||||
/* only used at mount-time */
|
||||
extern struct dentry * d_alloc_root(struct inode *);
|
||||
extern struct dentry * d_make_root(struct inode *);
|
||||
|
||||
/* <clickety>-<click> the ramfs-type tree */
|
||||
|
||||
@@ -86,7 +86,7 @@ struct dentry *debugfs_create_blob(const char *name, umode_t mode,
|
||||
struct dentry *parent,
|
||||
struct debugfs_blob_wrapper *blob);
|
||||
|
||||
struct dentry *debugfs_create_regset32(const char *name, mode_t mode,
|
||||
struct dentry *debugfs_create_regset32(const char *name, umode_t mode,
|
||||
struct dentry *parent,
|
||||
struct debugfs_regset32 *regset);
|
||||
|
||||
@@ -208,7 +208,7 @@ static inline struct dentry *debugfs_create_blob(const char *name, umode_t mode,
|
||||
}
|
||||
|
||||
static inline struct dentry *debugfs_create_regset32(const char *name,
|
||||
mode_t mode, struct dentry *parent,
|
||||
umode_t mode, struct dentry *parent,
|
||||
struct debugfs_regset32 *regset)
|
||||
{
|
||||
return ERR_PTR(-ENODEV);
|
||||
|
||||
@@ -12,7 +12,6 @@
|
||||
struct file;
|
||||
|
||||
extern void fput(struct file *);
|
||||
extern void drop_file_write_access(struct file *file);
|
||||
|
||||
struct file_operations;
|
||||
struct vfsmount;
|
||||
|
||||
@@ -1459,6 +1459,7 @@ struct super_block {
|
||||
u8 s_uuid[16]; /* UUID */
|
||||
|
||||
void *s_fs_info; /* Filesystem private info */
|
||||
unsigned int s_max_links;
|
||||
fmode_t s_mode;
|
||||
|
||||
/* Granularity of c/m/atime in ns.
|
||||
@@ -1811,11 +1812,11 @@ static inline void inode_inc_iversion(struct inode *inode)
|
||||
spin_unlock(&inode->i_lock);
|
||||
}
|
||||
|
||||
extern void touch_atime(struct vfsmount *mnt, struct dentry *dentry);
|
||||
extern void touch_atime(struct path *);
|
||||
static inline void file_accessed(struct file *file)
|
||||
{
|
||||
if (!(file->f_flags & O_NOATIME))
|
||||
touch_atime(file->f_path.mnt, file->f_path.dentry);
|
||||
touch_atime(&file->f_path);
|
||||
}
|
||||
|
||||
int sync_inode(struct inode *inode, struct writeback_control *wbc);
|
||||
@@ -2304,7 +2305,10 @@ extern struct inode * igrab(struct inode *);
|
||||
extern ino_t iunique(struct super_block *, ino_t);
|
||||
extern int inode_needs_sync(struct inode *inode);
|
||||
extern int generic_delete_inode(struct inode *inode);
|
||||
extern int generic_drop_inode(struct inode *inode);
|
||||
static inline int generic_drop_inode(struct inode *inode)
|
||||
{
|
||||
return !inode->i_nlink || inode_unhashed(inode);
|
||||
}
|
||||
|
||||
extern struct inode *ilookup5_nowait(struct super_block *sb,
|
||||
unsigned long hashval, int (*test)(struct inode *, void *),
|
||||
|
||||
@@ -42,6 +42,7 @@
|
||||
#define OPENPROM_SUPER_MAGIC 0x9fa1
|
||||
#define PROC_SUPER_MAGIC 0x9fa0
|
||||
#define QNX4_SUPER_MAGIC 0x002f /* qnx4 fs detection */
|
||||
#define QNX6_SUPER_MAGIC 0x68191122 /* qnx6 fs detection */
|
||||
|
||||
#define REISERFS_SUPER_MAGIC 0x52654973 /* used by gcc */
|
||||
/* used by file system utilities that
|
||||
|
||||
134
include/linux/qnx6_fs.h
Normal file
134
include/linux/qnx6_fs.h
Normal file
@@ -0,0 +1,134 @@
|
||||
/*
|
||||
* Name : qnx6_fs.h
|
||||
* Author : Kai Bankett
|
||||
* Function : qnx6 global filesystem definitions
|
||||
* History : 17-01-2012 created
|
||||
*/
|
||||
#ifndef _LINUX_QNX6_FS_H
|
||||
#define _LINUX_QNX6_FS_H
|
||||
|
||||
#include <linux/types.h>
|
||||
#include <linux/magic.h>
|
||||
|
||||
#define QNX6_ROOT_INO 1
|
||||
|
||||
/* for di_status */
|
||||
#define QNX6_FILE_DIRECTORY 0x01
|
||||
#define QNX6_FILE_DELETED 0x02
|
||||
#define QNX6_FILE_NORMAL 0x03
|
||||
|
||||
#define QNX6_SUPERBLOCK_SIZE 0x200 /* superblock always is 512 bytes */
|
||||
#define QNX6_SUPERBLOCK_AREA 0x1000 /* area reserved for superblock */
|
||||
#define QNX6_BOOTBLOCK_SIZE 0x2000 /* heading bootblock area */
|
||||
#define QNX6_DIR_ENTRY_SIZE 0x20 /* dir entry size of 32 bytes */
|
||||
#define QNX6_INODE_SIZE 0x80 /* each inode is 128 bytes */
|
||||
#define QNX6_INODE_SIZE_BITS 7 /* inode entry size shift */
|
||||
|
||||
#define QNX6_NO_DIRECT_POINTERS 16 /* 16 blockptrs in sbl/inode */
|
||||
#define QNX6_PTR_MAX_LEVELS 5 /* maximum indirect levels */
|
||||
|
||||
/* for filenames */
|
||||
#define QNX6_SHORT_NAME_MAX 27
|
||||
#define QNX6_LONG_NAME_MAX 510
|
||||
|
||||
/* list of mount options */
|
||||
#define QNX6_MOUNT_MMI_FS 0x010000 /* mount as Audi MMI 3G fs */
|
||||
|
||||
/*
|
||||
* This is the original qnx6 inode layout on disk.
|
||||
* Each inode is 128 byte long.
|
||||
*/
|
||||
struct qnx6_inode_entry {
|
||||
__fs64 di_size;
|
||||
__fs32 di_uid;
|
||||
__fs32 di_gid;
|
||||
__fs32 di_ftime;
|
||||
__fs32 di_mtime;
|
||||
__fs32 di_atime;
|
||||
__fs32 di_ctime;
|
||||
__fs16 di_mode;
|
||||
__fs16 di_ext_mode;
|
||||
__fs32 di_block_ptr[QNX6_NO_DIRECT_POINTERS];
|
||||
__u8 di_filelevels;
|
||||
__u8 di_status;
|
||||
__u8 di_unknown2[2];
|
||||
__fs32 di_zero2[6];
|
||||
};
|
||||
|
||||
/*
|
||||
* Each directory entry is maximum 32 bytes long.
|
||||
* If more characters or special characters required it is stored
|
||||
* in the longfilenames structure.
|
||||
*/
|
||||
struct qnx6_dir_entry {
|
||||
__fs32 de_inode;
|
||||
__u8 de_size;
|
||||
char de_fname[QNX6_SHORT_NAME_MAX];
|
||||
};
|
||||
|
||||
/*
|
||||
* Longfilename direntries have a different structure
|
||||
*/
|
||||
struct qnx6_long_dir_entry {
|
||||
__fs32 de_inode;
|
||||
__u8 de_size;
|
||||
__u8 de_unknown[3];
|
||||
__fs32 de_long_inode;
|
||||
__fs32 de_checksum;
|
||||
};
|
||||
|
||||
struct qnx6_long_filename {
|
||||
__fs16 lf_size;
|
||||
__u8 lf_fname[QNX6_LONG_NAME_MAX];
|
||||
};
|
||||
|
||||
struct qnx6_root_node {
|
||||
__fs64 size;
|
||||
__fs32 ptr[QNX6_NO_DIRECT_POINTERS];
|
||||
__u8 levels;
|
||||
__u8 mode;
|
||||
__u8 spare[6];
|
||||
};
|
||||
|
||||
struct qnx6_super_block {
|
||||
__fs32 sb_magic;
|
||||
__fs32 sb_checksum;
|
||||
__fs64 sb_serial;
|
||||
__fs32 sb_ctime; /* time the fs was created */
|
||||
__fs32 sb_atime; /* last access time */
|
||||
__fs32 sb_flags;
|
||||
__fs16 sb_version1; /* filesystem version information */
|
||||
__fs16 sb_version2; /* filesystem version information */
|
||||
__u8 sb_volumeid[16];
|
||||
__fs32 sb_blocksize;
|
||||
__fs32 sb_num_inodes;
|
||||
__fs32 sb_free_inodes;
|
||||
__fs32 sb_num_blocks;
|
||||
__fs32 sb_free_blocks;
|
||||
__fs32 sb_allocgroup;
|
||||
struct qnx6_root_node Inode;
|
||||
struct qnx6_root_node Bitmap;
|
||||
struct qnx6_root_node Longfile;
|
||||
struct qnx6_root_node Unknown;
|
||||
};
|
||||
|
||||
/* Audi MMI 3G superblock layout is different to plain qnx6 */
|
||||
struct qnx6_mmi_super_block {
|
||||
__fs32 sb_magic;
|
||||
__fs32 sb_checksum;
|
||||
__fs64 sb_serial;
|
||||
__u8 sb_spare0[12];
|
||||
__u8 sb_id[12];
|
||||
__fs32 sb_blocksize;
|
||||
__fs32 sb_num_inodes;
|
||||
__fs32 sb_free_inodes;
|
||||
__fs32 sb_num_blocks;
|
||||
__fs32 sb_free_blocks;
|
||||
__u8 sb_spare1[4];
|
||||
struct qnx6_root_node Inode;
|
||||
struct qnx6_root_node Bitmap;
|
||||
struct qnx6_root_node Longfile;
|
||||
struct qnx6_root_node Unknown;
|
||||
};
|
||||
|
||||
#endif
|
||||
@@ -1,76 +0,0 @@
|
||||
#include <linux/init.h>
|
||||
#include <linux/posix_acl.h>
|
||||
|
||||
#define REISERFS_ACL_VERSION 0x0001
|
||||
|
||||
typedef struct {
|
||||
__le16 e_tag;
|
||||
__le16 e_perm;
|
||||
__le32 e_id;
|
||||
} reiserfs_acl_entry;
|
||||
|
||||
typedef struct {
|
||||
__le16 e_tag;
|
||||
__le16 e_perm;
|
||||
} reiserfs_acl_entry_short;
|
||||
|
||||
typedef struct {
|
||||
__le32 a_version;
|
||||
} reiserfs_acl_header;
|
||||
|
||||
static inline size_t reiserfs_acl_size(int count)
|
||||
{
|
||||
if (count <= 4) {
|
||||
return sizeof(reiserfs_acl_header) +
|
||||
count * sizeof(reiserfs_acl_entry_short);
|
||||
} else {
|
||||
return sizeof(reiserfs_acl_header) +
|
||||
4 * sizeof(reiserfs_acl_entry_short) +
|
||||
(count - 4) * sizeof(reiserfs_acl_entry);
|
||||
}
|
||||
}
|
||||
|
||||
static inline int reiserfs_acl_count(size_t size)
|
||||
{
|
||||
ssize_t s;
|
||||
size -= sizeof(reiserfs_acl_header);
|
||||
s = size - 4 * sizeof(reiserfs_acl_entry_short);
|
||||
if (s < 0) {
|
||||
if (size % sizeof(reiserfs_acl_entry_short))
|
||||
return -1;
|
||||
return size / sizeof(reiserfs_acl_entry_short);
|
||||
} else {
|
||||
if (s % sizeof(reiserfs_acl_entry))
|
||||
return -1;
|
||||
return s / sizeof(reiserfs_acl_entry) + 4;
|
||||
}
|
||||
}
|
||||
|
||||
#ifdef CONFIG_REISERFS_FS_POSIX_ACL
|
||||
struct posix_acl *reiserfs_get_acl(struct inode *inode, int type);
|
||||
int reiserfs_acl_chmod(struct inode *inode);
|
||||
int reiserfs_inherit_default_acl(struct reiserfs_transaction_handle *th,
|
||||
struct inode *dir, struct dentry *dentry,
|
||||
struct inode *inode);
|
||||
int reiserfs_cache_default_acl(struct inode *dir);
|
||||
extern const struct xattr_handler reiserfs_posix_acl_default_handler;
|
||||
extern const struct xattr_handler reiserfs_posix_acl_access_handler;
|
||||
|
||||
#else
|
||||
|
||||
#define reiserfs_cache_default_acl(inode) 0
|
||||
#define reiserfs_get_acl NULL
|
||||
|
||||
static inline int reiserfs_acl_chmod(struct inode *inode)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
|
||||
static inline int
|
||||
reiserfs_inherit_default_acl(struct reiserfs_transaction_handle *th,
|
||||
const struct inode *dir, struct dentry *dentry,
|
||||
struct inode *inode)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
#endif
|
||||
File diff suppressed because it is too large
Load Diff
@@ -1,63 +0,0 @@
|
||||
#ifndef _REISER_FS_I
|
||||
#define _REISER_FS_I
|
||||
|
||||
#include <linux/list.h>
|
||||
|
||||
struct reiserfs_journal_list;
|
||||
|
||||
/** bitmasks for i_flags field in reiserfs-specific part of inode */
|
||||
typedef enum {
|
||||
/** this says what format of key do all items (but stat data) of
|
||||
an object have. If this is set, that format is 3.6 otherwise
|
||||
- 3.5 */
|
||||
i_item_key_version_mask = 0x0001,
|
||||
/** If this is unset, object has 3.5 stat data, otherwise, it has
|
||||
3.6 stat data with 64bit size, 32bit nlink etc. */
|
||||
i_stat_data_version_mask = 0x0002,
|
||||
/** file might need tail packing on close */
|
||||
i_pack_on_close_mask = 0x0004,
|
||||
/** don't pack tail of file */
|
||||
i_nopack_mask = 0x0008,
|
||||
/** If those is set, "safe link" was created for this file during
|
||||
truncate or unlink. Safe link is used to avoid leakage of disk
|
||||
space on crash with some files open, but unlinked. */
|
||||
i_link_saved_unlink_mask = 0x0010,
|
||||
i_link_saved_truncate_mask = 0x0020,
|
||||
i_has_xattr_dir = 0x0040,
|
||||
i_data_log = 0x0080,
|
||||
} reiserfs_inode_flags;
|
||||
|
||||
struct reiserfs_inode_info {
|
||||
__u32 i_key[4]; /* key is still 4 32 bit integers */
|
||||
/** transient inode flags that are never stored on disk. Bitmasks
|
||||
for this field are defined above. */
|
||||
__u32 i_flags;
|
||||
|
||||
__u32 i_first_direct_byte; // offset of first byte stored in direct item.
|
||||
|
||||
/* copy of persistent inode flags read from sd_attrs. */
|
||||
__u32 i_attrs;
|
||||
|
||||
int i_prealloc_block; /* first unused block of a sequence of unused blocks */
|
||||
int i_prealloc_count; /* length of that sequence */
|
||||
struct list_head i_prealloc_list; /* per-transaction list of inodes which
|
||||
* have preallocated blocks */
|
||||
|
||||
unsigned new_packing_locality:1; /* new_packig_locality is created; new blocks
|
||||
* for the contents of this directory should be
|
||||
* displaced */
|
||||
|
||||
/* we use these for fsync or O_SYNC to decide which transaction
|
||||
** needs to be committed in order for this inode to be properly
|
||||
** flushed */
|
||||
unsigned int i_trans_id;
|
||||
struct reiserfs_journal_list *i_jl;
|
||||
atomic_t openers;
|
||||
struct mutex tailpack;
|
||||
#ifdef CONFIG_REISERFS_FS_XATTR
|
||||
struct rw_semaphore i_xattr_sem;
|
||||
#endif
|
||||
struct inode vfs_inode;
|
||||
};
|
||||
|
||||
#endif
|
||||
@@ -1,554 +0,0 @@
|
||||
/* Copyright 1996-2000 Hans Reiser, see reiserfs/README for licensing
|
||||
* and copyright details */
|
||||
|
||||
#ifndef _LINUX_REISER_FS_SB
|
||||
#define _LINUX_REISER_FS_SB
|
||||
|
||||
#ifdef __KERNEL__
|
||||
#include <linux/workqueue.h>
|
||||
#include <linux/rwsem.h>
|
||||
#include <linux/mutex.h>
|
||||
#include <linux/sched.h>
|
||||
#endif
|
||||
|
||||
typedef enum {
|
||||
reiserfs_attrs_cleared = 0x00000001,
|
||||
} reiserfs_super_block_flags;
|
||||
|
||||
/* struct reiserfs_super_block accessors/mutators
|
||||
* since this is a disk structure, it will always be in
|
||||
* little endian format. */
|
||||
#define sb_block_count(sbp) (le32_to_cpu((sbp)->s_v1.s_block_count))
|
||||
#define set_sb_block_count(sbp,v) ((sbp)->s_v1.s_block_count = cpu_to_le32(v))
|
||||
#define sb_free_blocks(sbp) (le32_to_cpu((sbp)->s_v1.s_free_blocks))
|
||||
#define set_sb_free_blocks(sbp,v) ((sbp)->s_v1.s_free_blocks = cpu_to_le32(v))
|
||||
#define sb_root_block(sbp) (le32_to_cpu((sbp)->s_v1.s_root_block))
|
||||
#define set_sb_root_block(sbp,v) ((sbp)->s_v1.s_root_block = cpu_to_le32(v))
|
||||
|
||||
#define sb_jp_journal_1st_block(sbp) \
|
||||
(le32_to_cpu((sbp)->s_v1.s_journal.jp_journal_1st_block))
|
||||
#define set_sb_jp_journal_1st_block(sbp,v) \
|
||||
((sbp)->s_v1.s_journal.jp_journal_1st_block = cpu_to_le32(v))
|
||||
#define sb_jp_journal_dev(sbp) \
|
||||
(le32_to_cpu((sbp)->s_v1.s_journal.jp_journal_dev))
|
||||
#define set_sb_jp_journal_dev(sbp,v) \
|
||||
((sbp)->s_v1.s_journal.jp_journal_dev = cpu_to_le32(v))
|
||||
#define sb_jp_journal_size(sbp) \
|
||||
(le32_to_cpu((sbp)->s_v1.s_journal.jp_journal_size))
|
||||
#define set_sb_jp_journal_size(sbp,v) \
|
||||
((sbp)->s_v1.s_journal.jp_journal_size = cpu_to_le32(v))
|
||||
#define sb_jp_journal_trans_max(sbp) \
|
||||
(le32_to_cpu((sbp)->s_v1.s_journal.jp_journal_trans_max))
|
||||
#define set_sb_jp_journal_trans_max(sbp,v) \
|
||||
((sbp)->s_v1.s_journal.jp_journal_trans_max = cpu_to_le32(v))
|
||||
#define sb_jp_journal_magic(sbp) \
|
||||
(le32_to_cpu((sbp)->s_v1.s_journal.jp_journal_magic))
|
||||
#define set_sb_jp_journal_magic(sbp,v) \
|
||||
((sbp)->s_v1.s_journal.jp_journal_magic = cpu_to_le32(v))
|
||||
#define sb_jp_journal_max_batch(sbp) \
|
||||
(le32_to_cpu((sbp)->s_v1.s_journal.jp_journal_max_batch))
|
||||
#define set_sb_jp_journal_max_batch(sbp,v) \
|
||||
((sbp)->s_v1.s_journal.jp_journal_max_batch = cpu_to_le32(v))
|
||||
#define sb_jp_jourmal_max_commit_age(sbp) \
|
||||
(le32_to_cpu((sbp)->s_v1.s_journal.jp_journal_max_commit_age))
|
||||
#define set_sb_jp_journal_max_commit_age(sbp,v) \
|
||||
((sbp)->s_v1.s_journal.jp_journal_max_commit_age = cpu_to_le32(v))
|
||||
|
||||
#define sb_blocksize(sbp) (le16_to_cpu((sbp)->s_v1.s_blocksize))
|
||||
#define set_sb_blocksize(sbp,v) ((sbp)->s_v1.s_blocksize = cpu_to_le16(v))
|
||||
#define sb_oid_maxsize(sbp) (le16_to_cpu((sbp)->s_v1.s_oid_maxsize))
|
||||
#define set_sb_oid_maxsize(sbp,v) ((sbp)->s_v1.s_oid_maxsize = cpu_to_le16(v))
|
||||
#define sb_oid_cursize(sbp) (le16_to_cpu((sbp)->s_v1.s_oid_cursize))
|
||||
#define set_sb_oid_cursize(sbp,v) ((sbp)->s_v1.s_oid_cursize = cpu_to_le16(v))
|
||||
#define sb_umount_state(sbp) (le16_to_cpu((sbp)->s_v1.s_umount_state))
|
||||
#define set_sb_umount_state(sbp,v) ((sbp)->s_v1.s_umount_state = cpu_to_le16(v))
|
||||
#define sb_fs_state(sbp) (le16_to_cpu((sbp)->s_v1.s_fs_state))
|
||||
#define set_sb_fs_state(sbp,v) ((sbp)->s_v1.s_fs_state = cpu_to_le16(v))
|
||||
#define sb_hash_function_code(sbp) \
|
||||
(le32_to_cpu((sbp)->s_v1.s_hash_function_code))
|
||||
#define set_sb_hash_function_code(sbp,v) \
|
||||
((sbp)->s_v1.s_hash_function_code = cpu_to_le32(v))
|
||||
#define sb_tree_height(sbp) (le16_to_cpu((sbp)->s_v1.s_tree_height))
|
||||
#define set_sb_tree_height(sbp,v) ((sbp)->s_v1.s_tree_height = cpu_to_le16(v))
|
||||
#define sb_bmap_nr(sbp) (le16_to_cpu((sbp)->s_v1.s_bmap_nr))
|
||||
#define set_sb_bmap_nr(sbp,v) ((sbp)->s_v1.s_bmap_nr = cpu_to_le16(v))
|
||||
#define sb_version(sbp) (le16_to_cpu((sbp)->s_v1.s_version))
|
||||
#define set_sb_version(sbp,v) ((sbp)->s_v1.s_version = cpu_to_le16(v))
|
||||
|
||||
#define sb_mnt_count(sbp) (le16_to_cpu((sbp)->s_mnt_count))
|
||||
#define set_sb_mnt_count(sbp, v) ((sbp)->s_mnt_count = cpu_to_le16(v))
|
||||
|
||||
#define sb_reserved_for_journal(sbp) \
|
||||
(le16_to_cpu((sbp)->s_v1.s_reserved_for_journal))
|
||||
#define set_sb_reserved_for_journal(sbp,v) \
|
||||
((sbp)->s_v1.s_reserved_for_journal = cpu_to_le16(v))
|
||||
|
||||
/* LOGGING -- */
|
||||
|
||||
/* These all interelate for performance.
|
||||
**
|
||||
** If the journal block count is smaller than n transactions, you lose speed.
|
||||
** I don't know what n is yet, I'm guessing 8-16.
|
||||
**
|
||||
** typical transaction size depends on the application, how often fsync is
|
||||
** called, and how many metadata blocks you dirty in a 30 second period.
|
||||
** The more small files (<16k) you use, the larger your transactions will
|
||||
** be.
|
||||
**
|
||||
** If your journal fills faster than dirty buffers get flushed to disk, it must flush them before allowing the journal
|
||||
** to wrap, which slows things down. If you need high speed meta data updates, the journal should be big enough
|
||||
** to prevent wrapping before dirty meta blocks get to disk.
|
||||
**
|
||||
** If the batch max is smaller than the transaction max, you'll waste space at the end of the journal
|
||||
** because journal_end sets the next transaction to start at 0 if the next transaction has any chance of wrapping.
|
||||
**
|
||||
** The large the batch max age, the better the speed, and the more meta data changes you'll lose after a crash.
|
||||
**
|
||||
*/
|
||||
|
||||
/* don't mess with these for a while */
|
||||
/* we have a node size define somewhere in reiserfs_fs.h. -Hans */
|
||||
#define JOURNAL_BLOCK_SIZE 4096 /* BUG gotta get rid of this */
|
||||
#define JOURNAL_MAX_CNODE 1500 /* max cnodes to allocate. */
|
||||
#define JOURNAL_HASH_SIZE 8192
|
||||
#define JOURNAL_NUM_BITMAPS 5 /* number of copies of the bitmaps to have floating. Must be >= 2 */
|
||||
|
||||
/* One of these for every block in every transaction
|
||||
** Each one is in two hash tables. First, a hash of the current transaction, and after journal_end, a
|
||||
** hash of all the in memory transactions.
|
||||
** next and prev are used by the current transaction (journal_hash).
|
||||
** hnext and hprev are used by journal_list_hash. If a block is in more than one transaction, the journal_list_hash
|
||||
** links it in multiple times. This allows flush_journal_list to remove just the cnode belonging
|
||||
** to a given transaction.
|
||||
*/
|
||||
struct reiserfs_journal_cnode {
|
||||
struct buffer_head *bh; /* real buffer head */
|
||||
struct super_block *sb; /* dev of real buffer head */
|
||||
__u32 blocknr; /* block number of real buffer head, == 0 when buffer on disk */
|
||||
unsigned long state;
|
||||
struct reiserfs_journal_list *jlist; /* journal list this cnode lives in */
|
||||
struct reiserfs_journal_cnode *next; /* next in transaction list */
|
||||
struct reiserfs_journal_cnode *prev; /* prev in transaction list */
|
||||
struct reiserfs_journal_cnode *hprev; /* prev in hash list */
|
||||
struct reiserfs_journal_cnode *hnext; /* next in hash list */
|
||||
};
|
||||
|
||||
struct reiserfs_bitmap_node {
|
||||
int id;
|
||||
char *data;
|
||||
struct list_head list;
|
||||
};
|
||||
|
||||
struct reiserfs_list_bitmap {
|
||||
struct reiserfs_journal_list *journal_list;
|
||||
struct reiserfs_bitmap_node **bitmaps;
|
||||
};
|
||||
|
||||
/*
|
||||
** one of these for each transaction. The most important part here is the j_realblock.
|
||||
** this list of cnodes is used to hash all the blocks in all the commits, to mark all the
|
||||
** real buffer heads dirty once all the commits hit the disk,
|
||||
** and to make sure every real block in a transaction is on disk before allowing the log area
|
||||
** to be overwritten */
|
||||
struct reiserfs_journal_list {
|
||||
unsigned long j_start;
|
||||
unsigned long j_state;
|
||||
unsigned long j_len;
|
||||
atomic_t j_nonzerolen;
|
||||
atomic_t j_commit_left;
|
||||
atomic_t j_older_commits_done; /* all commits older than this on disk */
|
||||
struct mutex j_commit_mutex;
|
||||
unsigned int j_trans_id;
|
||||
time_t j_timestamp;
|
||||
struct reiserfs_list_bitmap *j_list_bitmap;
|
||||
struct buffer_head *j_commit_bh; /* commit buffer head */
|
||||
struct reiserfs_journal_cnode *j_realblock;
|
||||
struct reiserfs_journal_cnode *j_freedlist; /* list of buffers that were freed during this trans. free each of these on flush */
|
||||
/* time ordered list of all active transactions */
|
||||
struct list_head j_list;
|
||||
|
||||
/* time ordered list of all transactions we haven't tried to flush yet */
|
||||
struct list_head j_working_list;
|
||||
|
||||
/* list of tail conversion targets in need of flush before commit */
|
||||
struct list_head j_tail_bh_list;
|
||||
/* list of data=ordered buffers in need of flush before commit */
|
||||
struct list_head j_bh_list;
|
||||
int j_refcount;
|
||||
};
|
||||
|
||||
struct reiserfs_journal {
|
||||
struct buffer_head **j_ap_blocks; /* journal blocks on disk */
|
||||
struct reiserfs_journal_cnode *j_last; /* newest journal block */
|
||||
struct reiserfs_journal_cnode *j_first; /* oldest journal block. start here for traverse */
|
||||
|
||||
struct block_device *j_dev_bd;
|
||||
fmode_t j_dev_mode;
|
||||
int j_1st_reserved_block; /* first block on s_dev of reserved area journal */
|
||||
|
||||
unsigned long j_state;
|
||||
unsigned int j_trans_id;
|
||||
unsigned long j_mount_id;
|
||||
unsigned long j_start; /* start of current waiting commit (index into j_ap_blocks) */
|
||||
unsigned long j_len; /* length of current waiting commit */
|
||||
unsigned long j_len_alloc; /* number of buffers requested by journal_begin() */
|
||||
atomic_t j_wcount; /* count of writers for current commit */
|
||||
unsigned long j_bcount; /* batch count. allows turning X transactions into 1 */
|
||||
unsigned long j_first_unflushed_offset; /* first unflushed transactions offset */
|
||||
unsigned j_last_flush_trans_id; /* last fully flushed journal timestamp */
|
||||
struct buffer_head *j_header_bh;
|
||||
|
||||
time_t j_trans_start_time; /* time this transaction started */
|
||||
struct mutex j_mutex;
|
||||
struct mutex j_flush_mutex;
|
||||
wait_queue_head_t j_join_wait; /* wait for current transaction to finish before starting new one */
|
||||
atomic_t j_jlock; /* lock for j_join_wait */
|
||||
int j_list_bitmap_index; /* number of next list bitmap to use */
|
||||
int j_must_wait; /* no more journal begins allowed. MUST sleep on j_join_wait */
|
||||
int j_next_full_flush; /* next journal_end will flush all journal list */
|
||||
int j_next_async_flush; /* next journal_end will flush all async commits */
|
||||
|
||||
int j_cnode_used; /* number of cnodes on the used list */
|
||||
int j_cnode_free; /* number of cnodes on the free list */
|
||||
|
||||
unsigned int j_trans_max; /* max number of blocks in a transaction. */
|
||||
unsigned int j_max_batch; /* max number of blocks to batch into a trans */
|
||||
unsigned int j_max_commit_age; /* in seconds, how old can an async commit be */
|
||||
unsigned int j_max_trans_age; /* in seconds, how old can a transaction be */
|
||||
unsigned int j_default_max_commit_age; /* the default for the max commit age */
|
||||
|
||||
struct reiserfs_journal_cnode *j_cnode_free_list;
|
||||
struct reiserfs_journal_cnode *j_cnode_free_orig; /* orig pointer returned from vmalloc */
|
||||
|
||||
struct reiserfs_journal_list *j_current_jl;
|
||||
int j_free_bitmap_nodes;
|
||||
int j_used_bitmap_nodes;
|
||||
|
||||
int j_num_lists; /* total number of active transactions */
|
||||
int j_num_work_lists; /* number that need attention from kreiserfsd */
|
||||
|
||||
/* debugging to make sure things are flushed in order */
|
||||
unsigned int j_last_flush_id;
|
||||
|
||||
/* debugging to make sure things are committed in order */
|
||||
unsigned int j_last_commit_id;
|
||||
|
||||
struct list_head j_bitmap_nodes;
|
||||
struct list_head j_dirty_buffers;
|
||||
spinlock_t j_dirty_buffers_lock; /* protects j_dirty_buffers */
|
||||
|
||||
/* list of all active transactions */
|
||||
struct list_head j_journal_list;
|
||||
/* lists that haven't been touched by writeback attempts */
|
||||
struct list_head j_working_list;
|
||||
|
||||
struct reiserfs_list_bitmap j_list_bitmap[JOURNAL_NUM_BITMAPS]; /* array of bitmaps to record the deleted blocks */
|
||||
struct reiserfs_journal_cnode *j_hash_table[JOURNAL_HASH_SIZE]; /* hash table for real buffer heads in current trans */
|
||||
struct reiserfs_journal_cnode *j_list_hash_table[JOURNAL_HASH_SIZE]; /* hash table for all the real buffer heads in all
|
||||
the transactions */
|
||||
struct list_head j_prealloc_list; /* list of inodes which have preallocated blocks */
|
||||
int j_persistent_trans;
|
||||
unsigned long j_max_trans_size;
|
||||
unsigned long j_max_batch_size;
|
||||
|
||||
int j_errno;
|
||||
|
||||
/* when flushing ordered buffers, throttle new ordered writers */
|
||||
struct delayed_work j_work;
|
||||
struct super_block *j_work_sb;
|
||||
atomic_t j_async_throttle;
|
||||
};
|
||||
|
||||
enum journal_state_bits {
|
||||
J_WRITERS_BLOCKED = 1, /* set when new writers not allowed */
|
||||
J_WRITERS_QUEUED, /* set when log is full due to too many writers */
|
||||
J_ABORTED, /* set when log is aborted */
|
||||
};
|
||||
|
||||
#define JOURNAL_DESC_MAGIC "ReIsErLB" /* ick. magic string to find desc blocks in the journal */
|
||||
|
||||
typedef __u32(*hashf_t) (const signed char *, int);
|
||||
|
||||
struct reiserfs_bitmap_info {
|
||||
__u32 free_count;
|
||||
};
|
||||
|
||||
struct proc_dir_entry;
|
||||
|
||||
#if defined( CONFIG_PROC_FS ) && defined( CONFIG_REISERFS_PROC_INFO )
|
||||
typedef unsigned long int stat_cnt_t;
|
||||
typedef struct reiserfs_proc_info_data {
|
||||
spinlock_t lock;
|
||||
int exiting;
|
||||
int max_hash_collisions;
|
||||
|
||||
stat_cnt_t breads;
|
||||
stat_cnt_t bread_miss;
|
||||
stat_cnt_t search_by_key;
|
||||
stat_cnt_t search_by_key_fs_changed;
|
||||
stat_cnt_t search_by_key_restarted;
|
||||
|
||||
stat_cnt_t insert_item_restarted;
|
||||
stat_cnt_t paste_into_item_restarted;
|
||||
stat_cnt_t cut_from_item_restarted;
|
||||
stat_cnt_t delete_solid_item_restarted;
|
||||
stat_cnt_t delete_item_restarted;
|
||||
|
||||
stat_cnt_t leaked_oid;
|
||||
stat_cnt_t leaves_removable;
|
||||
|
||||
/* balances per level. Use explicit 5 as MAX_HEIGHT is not visible yet. */
|
||||
stat_cnt_t balance_at[5]; /* XXX */
|
||||
/* sbk == search_by_key */
|
||||
stat_cnt_t sbk_read_at[5]; /* XXX */
|
||||
stat_cnt_t sbk_fs_changed[5];
|
||||
stat_cnt_t sbk_restarted[5];
|
||||
stat_cnt_t items_at[5]; /* XXX */
|
||||
stat_cnt_t free_at[5]; /* XXX */
|
||||
stat_cnt_t can_node_be_removed[5]; /* XXX */
|
||||
long int lnum[5]; /* XXX */
|
||||
long int rnum[5]; /* XXX */
|
||||
long int lbytes[5]; /* XXX */
|
||||
long int rbytes[5]; /* XXX */
|
||||
stat_cnt_t get_neighbors[5];
|
||||
stat_cnt_t get_neighbors_restart[5];
|
||||
stat_cnt_t need_l_neighbor[5];
|
||||
stat_cnt_t need_r_neighbor[5];
|
||||
|
||||
stat_cnt_t free_block;
|
||||
struct __scan_bitmap_stats {
|
||||
stat_cnt_t call;
|
||||
stat_cnt_t wait;
|
||||
stat_cnt_t bmap;
|
||||
stat_cnt_t retry;
|
||||
stat_cnt_t in_journal_hint;
|
||||
stat_cnt_t in_journal_nohint;
|
||||
stat_cnt_t stolen;
|
||||
} scan_bitmap;
|
||||
struct __journal_stats {
|
||||
stat_cnt_t in_journal;
|
||||
stat_cnt_t in_journal_bitmap;
|
||||
stat_cnt_t in_journal_reusable;
|
||||
stat_cnt_t lock_journal;
|
||||
stat_cnt_t lock_journal_wait;
|
||||
stat_cnt_t journal_being;
|
||||
stat_cnt_t journal_relock_writers;
|
||||
stat_cnt_t journal_relock_wcount;
|
||||
stat_cnt_t mark_dirty;
|
||||
stat_cnt_t mark_dirty_already;
|
||||
stat_cnt_t mark_dirty_notjournal;
|
||||
stat_cnt_t restore_prepared;
|
||||
stat_cnt_t prepare;
|
||||
stat_cnt_t prepare_retry;
|
||||
} journal;
|
||||
} reiserfs_proc_info_data_t;
|
||||
#else
|
||||
typedef struct reiserfs_proc_info_data {
|
||||
} reiserfs_proc_info_data_t;
|
||||
#endif
|
||||
|
||||
/* reiserfs union of in-core super block data */
|
||||
struct reiserfs_sb_info {
|
||||
struct buffer_head *s_sbh; /* Buffer containing the super block */
|
||||
/* both the comment and the choice of
|
||||
name are unclear for s_rs -Hans */
|
||||
struct reiserfs_super_block *s_rs; /* Pointer to the super block in the buffer */
|
||||
struct reiserfs_bitmap_info *s_ap_bitmap;
|
||||
struct reiserfs_journal *s_journal; /* pointer to journal information */
|
||||
unsigned short s_mount_state; /* reiserfs state (valid, invalid) */
|
||||
|
||||
/* Serialize writers access, replace the old bkl */
|
||||
struct mutex lock;
|
||||
/* Owner of the lock (can be recursive) */
|
||||
struct task_struct *lock_owner;
|
||||
/* Depth of the lock, start from -1 like the bkl */
|
||||
int lock_depth;
|
||||
|
||||
/* Comment? -Hans */
|
||||
void (*end_io_handler) (struct buffer_head *, int);
|
||||
hashf_t s_hash_function; /* pointer to function which is used
|
||||
to sort names in directory. Set on
|
||||
mount */
|
||||
unsigned long s_mount_opt; /* reiserfs's mount options are set
|
||||
here (currently - NOTAIL, NOLOG,
|
||||
REPLAYONLY) */
|
||||
|
||||
struct { /* This is a structure that describes block allocator options */
|
||||
unsigned long bits; /* Bitfield for enable/disable kind of options */
|
||||
unsigned long large_file_size; /* size started from which we consider file to be a large one(in blocks) */
|
||||
int border; /* percentage of disk, border takes */
|
||||
int preallocmin; /* Minimal file size (in blocks) starting from which we do preallocations */
|
||||
int preallocsize; /* Number of blocks we try to prealloc when file
|
||||
reaches preallocmin size (in blocks) or
|
||||
prealloc_list is empty. */
|
||||
} s_alloc_options;
|
||||
|
||||
/* Comment? -Hans */
|
||||
wait_queue_head_t s_wait;
|
||||
/* To be obsoleted soon by per buffer seals.. -Hans */
|
||||
atomic_t s_generation_counter; // increased by one every time the
|
||||
// tree gets re-balanced
|
||||
unsigned long s_properties; /* File system properties. Currently holds
|
||||
on-disk FS format */
|
||||
|
||||
/* session statistics */
|
||||
int s_disk_reads;
|
||||
int s_disk_writes;
|
||||
int s_fix_nodes;
|
||||
int s_do_balance;
|
||||
int s_unneeded_left_neighbor;
|
||||
int s_good_search_by_key_reada;
|
||||
int s_bmaps;
|
||||
int s_bmaps_without_search;
|
||||
int s_direct2indirect;
|
||||
int s_indirect2direct;
|
||||
/* set up when it's ok for reiserfs_read_inode2() to read from
|
||||
disk inode with nlink==0. Currently this is only used during
|
||||
finish_unfinished() processing at mount time */
|
||||
int s_is_unlinked_ok;
|
||||
reiserfs_proc_info_data_t s_proc_info_data;
|
||||
struct proc_dir_entry *procdir;
|
||||
int reserved_blocks; /* amount of blocks reserved for further allocations */
|
||||
spinlock_t bitmap_lock; /* this lock on now only used to protect reserved_blocks variable */
|
||||
struct dentry *priv_root; /* root of /.reiserfs_priv */
|
||||
struct dentry *xattr_root; /* root of /.reiserfs_priv/xattrs */
|
||||
int j_errno;
|
||||
#ifdef CONFIG_QUOTA
|
||||
char *s_qf_names[MAXQUOTAS];
|
||||
int s_jquota_fmt;
|
||||
#endif
|
||||
char *s_jdev; /* Stored jdev for mount option showing */
|
||||
#ifdef CONFIG_REISERFS_CHECK
|
||||
|
||||
struct tree_balance *cur_tb; /*
|
||||
* Detects whether more than one
|
||||
* copy of tb exists per superblock
|
||||
* as a means of checking whether
|
||||
* do_balance is executing concurrently
|
||||
* against another tree reader/writer
|
||||
* on a same mount point.
|
||||
*/
|
||||
#endif
|
||||
};
|
||||
|
||||
/* Definitions of reiserfs on-disk properties: */
|
||||
#define REISERFS_3_5 0
|
||||
#define REISERFS_3_6 1
|
||||
#define REISERFS_OLD_FORMAT 2
|
||||
|
||||
enum reiserfs_mount_options {
|
||||
/* Mount options */
|
||||
REISERFS_LARGETAIL, /* large tails will be created in a session */
|
||||
REISERFS_SMALLTAIL, /* small (for files less than block size) tails will be created in a session */
|
||||
REPLAYONLY, /* replay journal and return 0. Use by fsck */
|
||||
REISERFS_CONVERT, /* -o conv: causes conversion of old
|
||||
format super block to the new
|
||||
format. If not specified - old
|
||||
partition will be dealt with in a
|
||||
manner of 3.5.x */
|
||||
|
||||
/* -o hash={tea, rupasov, r5, detect} is meant for properly mounting
|
||||
** reiserfs disks from 3.5.19 or earlier. 99% of the time, this option
|
||||
** is not required. If the normal autodection code can't determine which
|
||||
** hash to use (because both hashes had the same value for a file)
|
||||
** use this option to force a specific hash. It won't allow you to override
|
||||
** the existing hash on the FS, so if you have a tea hash disk, and mount
|
||||
** with -o hash=rupasov, the mount will fail.
|
||||
*/
|
||||
FORCE_TEA_HASH, /* try to force tea hash on mount */
|
||||
FORCE_RUPASOV_HASH, /* try to force rupasov hash on mount */
|
||||
FORCE_R5_HASH, /* try to force rupasov hash on mount */
|
||||
FORCE_HASH_DETECT, /* try to detect hash function on mount */
|
||||
|
||||
REISERFS_DATA_LOG,
|
||||
REISERFS_DATA_ORDERED,
|
||||
REISERFS_DATA_WRITEBACK,
|
||||
|
||||
/* used for testing experimental features, makes benchmarking new
|
||||
features with and without more convenient, should never be used by
|
||||
users in any code shipped to users (ideally) */
|
||||
|
||||
REISERFS_NO_BORDER,
|
||||
REISERFS_NO_UNHASHED_RELOCATION,
|
||||
REISERFS_HASHED_RELOCATION,
|
||||
REISERFS_ATTRS,
|
||||
REISERFS_XATTRS_USER,
|
||||
REISERFS_POSIXACL,
|
||||
REISERFS_EXPOSE_PRIVROOT,
|
||||
REISERFS_BARRIER_NONE,
|
||||
REISERFS_BARRIER_FLUSH,
|
||||
|
||||
/* Actions on error */
|
||||
REISERFS_ERROR_PANIC,
|
||||
REISERFS_ERROR_RO,
|
||||
REISERFS_ERROR_CONTINUE,
|
||||
|
||||
REISERFS_USRQUOTA, /* User quota option specified */
|
||||
REISERFS_GRPQUOTA, /* Group quota option specified */
|
||||
|
||||
REISERFS_TEST1,
|
||||
REISERFS_TEST2,
|
||||
REISERFS_TEST3,
|
||||
REISERFS_TEST4,
|
||||
REISERFS_UNSUPPORTED_OPT,
|
||||
};
|
||||
|
||||
#define reiserfs_r5_hash(s) (REISERFS_SB(s)->s_mount_opt & (1 << FORCE_R5_HASH))
|
||||
#define reiserfs_rupasov_hash(s) (REISERFS_SB(s)->s_mount_opt & (1 << FORCE_RUPASOV_HASH))
|
||||
#define reiserfs_tea_hash(s) (REISERFS_SB(s)->s_mount_opt & (1 << FORCE_TEA_HASH))
|
||||
#define reiserfs_hash_detect(s) (REISERFS_SB(s)->s_mount_opt & (1 << FORCE_HASH_DETECT))
|
||||
#define reiserfs_no_border(s) (REISERFS_SB(s)->s_mount_opt & (1 << REISERFS_NO_BORDER))
|
||||
#define reiserfs_no_unhashed_relocation(s) (REISERFS_SB(s)->s_mount_opt & (1 << REISERFS_NO_UNHASHED_RELOCATION))
|
||||
#define reiserfs_hashed_relocation(s) (REISERFS_SB(s)->s_mount_opt & (1 << REISERFS_HASHED_RELOCATION))
|
||||
#define reiserfs_test4(s) (REISERFS_SB(s)->s_mount_opt & (1 << REISERFS_TEST4))
|
||||
|
||||
#define have_large_tails(s) (REISERFS_SB(s)->s_mount_opt & (1 << REISERFS_LARGETAIL))
|
||||
#define have_small_tails(s) (REISERFS_SB(s)->s_mount_opt & (1 << REISERFS_SMALLTAIL))
|
||||
#define replay_only(s) (REISERFS_SB(s)->s_mount_opt & (1 << REPLAYONLY))
|
||||
#define reiserfs_attrs(s) (REISERFS_SB(s)->s_mount_opt & (1 << REISERFS_ATTRS))
|
||||
#define old_format_only(s) (REISERFS_SB(s)->s_properties & (1 << REISERFS_3_5))
|
||||
#define convert_reiserfs(s) (REISERFS_SB(s)->s_mount_opt & (1 << REISERFS_CONVERT))
|
||||
#define reiserfs_data_log(s) (REISERFS_SB(s)->s_mount_opt & (1 << REISERFS_DATA_LOG))
|
||||
#define reiserfs_data_ordered(s) (REISERFS_SB(s)->s_mount_opt & (1 << REISERFS_DATA_ORDERED))
|
||||
#define reiserfs_data_writeback(s) (REISERFS_SB(s)->s_mount_opt & (1 << REISERFS_DATA_WRITEBACK))
|
||||
#define reiserfs_xattrs_user(s) (REISERFS_SB(s)->s_mount_opt & (1 << REISERFS_XATTRS_USER))
|
||||
#define reiserfs_posixacl(s) (REISERFS_SB(s)->s_mount_opt & (1 << REISERFS_POSIXACL))
|
||||
#define reiserfs_expose_privroot(s) (REISERFS_SB(s)->s_mount_opt & (1 << REISERFS_EXPOSE_PRIVROOT))
|
||||
#define reiserfs_xattrs_optional(s) (reiserfs_xattrs_user(s) || reiserfs_posixacl(s))
|
||||
#define reiserfs_barrier_none(s) (REISERFS_SB(s)->s_mount_opt & (1 << REISERFS_BARRIER_NONE))
|
||||
#define reiserfs_barrier_flush(s) (REISERFS_SB(s)->s_mount_opt & (1 << REISERFS_BARRIER_FLUSH))
|
||||
|
||||
#define reiserfs_error_panic(s) (REISERFS_SB(s)->s_mount_opt & (1 << REISERFS_ERROR_PANIC))
|
||||
#define reiserfs_error_ro(s) (REISERFS_SB(s)->s_mount_opt & (1 << REISERFS_ERROR_RO))
|
||||
|
||||
void reiserfs_file_buffer(struct buffer_head *bh, int list);
|
||||
extern struct file_system_type reiserfs_fs_type;
|
||||
int reiserfs_resize(struct super_block *, unsigned long);
|
||||
|
||||
#define CARRY_ON 0
|
||||
#define SCHEDULE_OCCURRED 1
|
||||
|
||||
#define SB_BUFFER_WITH_SB(s) (REISERFS_SB(s)->s_sbh)
|
||||
#define SB_JOURNAL(s) (REISERFS_SB(s)->s_journal)
|
||||
#define SB_JOURNAL_1st_RESERVED_BLOCK(s) (SB_JOURNAL(s)->j_1st_reserved_block)
|
||||
#define SB_JOURNAL_LEN_FREE(s) (SB_JOURNAL(s)->j_journal_len_free)
|
||||
#define SB_AP_BITMAP(s) (REISERFS_SB(s)->s_ap_bitmap)
|
||||
|
||||
#define SB_DISK_JOURNAL_HEAD(s) (SB_JOURNAL(s)->j_header_bh->)
|
||||
|
||||
/* A safe version of the "bdevname", which returns the "s_id" field of
|
||||
* a superblock or else "Null superblock" if the super block is NULL.
|
||||
*/
|
||||
static inline char *reiserfs_bdevname(struct super_block *s)
|
||||
{
|
||||
return (s == NULL) ? "Null superblock" : s->s_id;
|
||||
}
|
||||
|
||||
#define reiserfs_is_journal_aborted(journal) (unlikely (__reiserfs_is_journal_aborted (journal)))
|
||||
static inline int __reiserfs_is_journal_aborted(struct reiserfs_journal
|
||||
*journal)
|
||||
{
|
||||
return test_bit(J_ABORTED, &journal->j_state);
|
||||
}
|
||||
|
||||
#endif /* _LINUX_REISER_FS_SB */
|
||||
@@ -21,132 +21,4 @@ struct reiserfs_security_handle {
|
||||
size_t length;
|
||||
};
|
||||
|
||||
#ifdef __KERNEL__
|
||||
|
||||
#include <linux/init.h>
|
||||
#include <linux/list.h>
|
||||
#include <linux/rwsem.h>
|
||||
#include <linux/reiserfs_fs_i.h>
|
||||
#include <linux/reiserfs_fs.h>
|
||||
|
||||
struct inode;
|
||||
struct dentry;
|
||||
struct iattr;
|
||||
struct super_block;
|
||||
struct nameidata;
|
||||
|
||||
int reiserfs_xattr_register_handlers(void) __init;
|
||||
void reiserfs_xattr_unregister_handlers(void);
|
||||
int reiserfs_xattr_init(struct super_block *sb, int mount_flags);
|
||||
int reiserfs_lookup_privroot(struct super_block *sb);
|
||||
int reiserfs_delete_xattrs(struct inode *inode);
|
||||
int reiserfs_chown_xattrs(struct inode *inode, struct iattr *attrs);
|
||||
int reiserfs_permission(struct inode *inode, int mask);
|
||||
|
||||
#ifdef CONFIG_REISERFS_FS_XATTR
|
||||
#define has_xattr_dir(inode) (REISERFS_I(inode)->i_flags & i_has_xattr_dir)
|
||||
ssize_t reiserfs_getxattr(struct dentry *dentry, const char *name,
|
||||
void *buffer, size_t size);
|
||||
int reiserfs_setxattr(struct dentry *dentry, const char *name,
|
||||
const void *value, size_t size, int flags);
|
||||
ssize_t reiserfs_listxattr(struct dentry *dentry, char *buffer, size_t size);
|
||||
int reiserfs_removexattr(struct dentry *dentry, const char *name);
|
||||
|
||||
int reiserfs_xattr_get(struct inode *, const char *, void *, size_t);
|
||||
int reiserfs_xattr_set(struct inode *, const char *, const void *, size_t, int);
|
||||
int reiserfs_xattr_set_handle(struct reiserfs_transaction_handle *,
|
||||
struct inode *, const char *, const void *,
|
||||
size_t, int);
|
||||
|
||||
extern const struct xattr_handler reiserfs_xattr_user_handler;
|
||||
extern const struct xattr_handler reiserfs_xattr_trusted_handler;
|
||||
extern const struct xattr_handler reiserfs_xattr_security_handler;
|
||||
#ifdef CONFIG_REISERFS_FS_SECURITY
|
||||
int reiserfs_security_init(struct inode *dir, struct inode *inode,
|
||||
const struct qstr *qstr,
|
||||
struct reiserfs_security_handle *sec);
|
||||
int reiserfs_security_write(struct reiserfs_transaction_handle *th,
|
||||
struct inode *inode,
|
||||
struct reiserfs_security_handle *sec);
|
||||
void reiserfs_security_free(struct reiserfs_security_handle *sec);
|
||||
#endif
|
||||
|
||||
static inline int reiserfs_xattrs_initialized(struct super_block *sb)
|
||||
{
|
||||
return REISERFS_SB(sb)->priv_root != NULL;
|
||||
}
|
||||
|
||||
#define xattr_size(size) ((size) + sizeof(struct reiserfs_xattr_header))
|
||||
static inline loff_t reiserfs_xattr_nblocks(struct inode *inode, loff_t size)
|
||||
{
|
||||
loff_t ret = 0;
|
||||
if (reiserfs_file_data_log(inode)) {
|
||||
ret = _ROUND_UP(xattr_size(size), inode->i_sb->s_blocksize);
|
||||
ret >>= inode->i_sb->s_blocksize_bits;
|
||||
}
|
||||
return ret;
|
||||
}
|
||||
|
||||
/* We may have to create up to 3 objects: xattr root, xattr dir, xattr file.
|
||||
* Let's try to be smart about it.
|
||||
* xattr root: We cache it. If it's not cached, we may need to create it.
|
||||
* xattr dir: If anything has been loaded for this inode, we can set a flag
|
||||
* saying so.
|
||||
* xattr file: Since we don't cache xattrs, we can't tell. We always include
|
||||
* blocks for it.
|
||||
*
|
||||
* However, since root and dir can be created between calls - YOU MUST SAVE
|
||||
* THIS VALUE.
|
||||
*/
|
||||
static inline size_t reiserfs_xattr_jcreate_nblocks(struct inode *inode)
|
||||
{
|
||||
size_t nblocks = JOURNAL_BLOCKS_PER_OBJECT(inode->i_sb);
|
||||
|
||||
if ((REISERFS_I(inode)->i_flags & i_has_xattr_dir) == 0) {
|
||||
nblocks += JOURNAL_BLOCKS_PER_OBJECT(inode->i_sb);
|
||||
if (!REISERFS_SB(inode->i_sb)->xattr_root->d_inode)
|
||||
nblocks += JOURNAL_BLOCKS_PER_OBJECT(inode->i_sb);
|
||||
}
|
||||
|
||||
return nblocks;
|
||||
}
|
||||
|
||||
static inline void reiserfs_init_xattr_rwsem(struct inode *inode)
|
||||
{
|
||||
init_rwsem(&REISERFS_I(inode)->i_xattr_sem);
|
||||
}
|
||||
|
||||
#else
|
||||
|
||||
#define reiserfs_getxattr NULL
|
||||
#define reiserfs_setxattr NULL
|
||||
#define reiserfs_listxattr NULL
|
||||
#define reiserfs_removexattr NULL
|
||||
|
||||
static inline void reiserfs_init_xattr_rwsem(struct inode *inode)
|
||||
{
|
||||
}
|
||||
#endif /* CONFIG_REISERFS_FS_XATTR */
|
||||
|
||||
#ifndef CONFIG_REISERFS_FS_SECURITY
|
||||
static inline int reiserfs_security_init(struct inode *dir,
|
||||
struct inode *inode,
|
||||
const struct qstr *qstr,
|
||||
struct reiserfs_security_handle *sec)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
static inline int
|
||||
reiserfs_security_write(struct reiserfs_transaction_handle *th,
|
||||
struct inode *inode,
|
||||
struct reiserfs_security_handle *sec)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
static inline void reiserfs_security_free(struct reiserfs_security_handle *sec)
|
||||
{}
|
||||
#endif
|
||||
|
||||
#endif /* __KERNEL__ */
|
||||
|
||||
#endif /* _LINUX_REISERFS_XATTR_H */
|
||||
|
||||
@@ -44,7 +44,7 @@ extern int trace_seq_putmem(struct trace_seq *s, const void *mem, size_t len);
|
||||
extern int trace_seq_putmem_hex(struct trace_seq *s, const void *mem,
|
||||
size_t len);
|
||||
extern void *trace_seq_reserve(struct trace_seq *s, size_t len);
|
||||
extern int trace_seq_path(struct trace_seq *s, struct path *path);
|
||||
extern int trace_seq_path(struct trace_seq *s, const struct path *path);
|
||||
|
||||
#else /* CONFIG_TRACING */
|
||||
static inline int trace_seq_printf(struct trace_seq *s, const char *fmt, ...)
|
||||
@@ -88,7 +88,7 @@ static inline void *trace_seq_reserve(struct trace_seq *s, size_t len)
|
||||
{
|
||||
return NULL;
|
||||
}
|
||||
static inline int trace_seq_path(struct trace_seq *s, struct path *path)
|
||||
static inline int trace_seq_path(struct trace_seq *s, const struct path *path)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user