xfs
[Top] [All Lists]

linux-next: manual merge of the akpm tree with the xfs tree

To: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
Subject: linux-next: manual merge of the akpm tree with the xfs tree
From: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
Date: Fri, 12 Jul 2013 13:15:46 +1000
Cc: linux-next@xxxxxxxxxxxxxxx, linux-kernel@xxxxxxxxxxxxxxx, Chandra Seetharaman <sekharan@xxxxxxxxxx>, Ben Myers <bpm@xxxxxxx>, David Chinner <david@xxxxxxxxxxxxx>, xfs@xxxxxxxxxxx, Glauber Costa <glommer@xxxxxxxxxx>
Delivered-to: xfs@xxxxxxxxxxx
Hi Andrew,

Today's linux-next merge of the akpm tree got a conflict in
fs/xfs/xfs_qm.h between commit 92f8ff73f186 ("xfs: Add pquota fields
where gquota is used") from the xfs tree and commit  "xfs: convert dquot
cache lru to list_lru" from the akpm tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx

diff --cc fs/xfs/xfs_qm.h
index 579d6a0,cf2ad1f..0000000
--- a/fs/xfs/xfs_qm.h
+++ b/fs/xfs/xfs_qm.h
@@@ -44,14 -44,10 +44,12 @@@ extern struct kmem_zone    *xfs_qm_dqtrxzo
  typedef struct xfs_quotainfo {
        struct radix_tree_root qi_uquota_tree;
        struct radix_tree_root qi_gquota_tree;
 +      struct radix_tree_root qi_pquota_tree;
        struct mutex qi_tree_lock;
 -      xfs_inode_t     *qi_uquotaip;    /* user quota inode */
 -      xfs_inode_t     *qi_gquotaip;    /* group quota inode */
 +      struct xfs_inode        *qi_uquotaip;   /* user quota inode */
 +      struct xfs_inode        *qi_gquotaip;   /* group quota inode */
 +      struct xfs_inode        *qi_pquotaip;   /* project quota inode */
-       struct list_head qi_lru_list;
-       struct mutex     qi_lru_lock;
-       int              qi_lru_count;
+       struct list_lru  qi_lru;
        int              qi_dquots;
        time_t           qi_btimelimit;  /* limit for blks timer */
        time_t           qi_itimelimit;  /* limit for inodes timer */

Attachment: pgp4Sg_IIJ41l.pgp
Description: PGP signature

<Prev in Thread] Current Thread [Next in Thread>
  • linux-next: manual merge of the akpm tree with the xfs tree, Stephen Rothwell <=