#define ADMIN_USR "admin_quotafile_v2.usr"
#define ADMIN_GRP "admin_quotafile_v2.grp"
+/* Statfs space reservation for fragmentation and local objects */
+#define OSD_STATFS_RESERVED (1ULL << 23) /* 8MB */
+#define OSD_STATFS_RESERVED_SHIFT (7) /* reserve 0.78% of all space */
+
struct osd_directory {
struct iam_container od_container;
struct iam_descr od_descr;
#ifdef CONFIG_LOCKDEP
struct lockdep_map oo_dep_map;
#endif
+
+ struct list_head oo_xattr_list;
};
struct osd_obj_seq {
unsigned short ot_credits;
unsigned short ot_id_cnt;
unsigned short ot_id_type;
- int ot_remove_agents:1;
+ unsigned int ot_remove_agents:1;
uid_t ot_id_array[OSD_MAX_UGID_CNT];
struct lquota_trans *ot_quota_trans;
#if OSD_THANDLE_STATS
* there would be one ext3 readdir for every mdd readdir page.
*/
-#define OSD_IT_EA_BUFSIZE (PAGE_CACHE_SIZE + PAGE_CACHE_SIZE/4)
+#define OSD_IT_EA_BUFSIZE (PAGE_SIZE + PAGE_SIZE/4)
/**
* This is iterator's in-memory data structure in interoperability
struct list_head oiq_list;
};
-#define MAX_BLOCKS_PER_PAGE (PAGE_CACHE_SIZE / 512)
+#define MAX_BLOCKS_PER_PAGE (PAGE_SIZE / 512)
struct osd_iobuf {
wait_queue_head_t dr_wait;
/* used by quota code */
union {
-#ifdef HAVE_DQUOT_FS_DISK_QUOTA
+#if defined(HAVE_DQUOT_QC_DQBLK)
+ struct qc_dqblk oti_qdq;
+#elif defined(HAVE_DQUOT_FS_DISK_QUOTA)
struct fs_disk_quota oti_fdq;
#else
struct if_dqblk oti_dqblk;
# define osd_ldiskfs_append(handle, inode, nblock) \
ldiskfs_append(handle, inode, nblock)
# define osd_ldiskfs_find_entry(dir, name, de, inlined, lock) \
- __ldiskfs_find_entry(dir, name, de, inlined, lock)
+ (__ldiskfs_find_entry(dir, name, de, inlined, lock) ?: \
+ ERR_PTR(-ENOENT))
# define osd_journal_start(inode, type, nblocks) \
ldiskfs_journal_start(inode, type, nblocks)
# define osd_transaction_size(dev) \
}
# define osd_ldiskfs_find_entry(dir, name, de, inlined, lock) \
- __ldiskfs_find_entry(dir, name, de, lock)
+ (__ldiskfs_find_entry(dir, name, de, lock) ?: \
+ ERR_PTR(-ENOENT))
# define osd_journal_start(inode, type, nblocks) \
ldiskfs_journal_start(inode, nblocks)
# define osd_transaction_size(dev) \
static inline int is_32bit_api(void)
{
#ifdef CONFIG_COMPAT
- return is_compat_task();
+ return in_compat_syscall();
#else
return (BITS_PER_LONG == 32);
#endif
return dev->od_mdt_map->omm_remote_parent->d_inode->i_ino;
}
+/**
+ * ext4_bread/ldiskfs_bread has either 5 or 4 parameters. The error
+ * return code has been removed and integrated into the pointer in the
+ * kernel 3.18.
+ */
+static inline struct buffer_head *__ldiskfs_bread(handle_t *handle,
+ struct inode *inode,
+ ldiskfs_lblk_t block,
+ int create)
+{
+#ifdef HAVE_EXT4_BREAD_4ARGS
+ return ldiskfs_bread(handle, inode, block, create);
+#else
+ struct buffer_head *bh;
+ int error = 0;
+
+ bh = ldiskfs_bread(handle, inode, block, create, &error);
+ if (bh == NULL && error != 0)
+ bh = ERR_PTR(error);
+
+ return bh;
+#endif
+}
+
void ldiskfs_inc_count(handle_t *handle, struct inode *inode);
void ldiskfs_dec_count(handle_t *handle, struct inode *inode);