LU-1994 kernel: fix reference counting with l_dentry_open

[fs/lustre-release.git] / lustre / include / linux / lustre_compat25.h

diff --git a/lustre/include/linux/lustre_compat25.h b/lustre/include/linux/lustre_compat25.h
index 593b3ac..e0a29ff 100644 (file)
--- a/lustre/include/linux/lustre_compat25.h
+++ b/lustre/include/linux/lustre_compat25.h
@@ -140,19 +140,28 @@ static inline void ll_set_fs_pwd(struct fs_struct *fs, struct vfsmount *mnt,
 #define ll_blkdev_put(a, b) blkdev_put(a)
 #endif
 
-static inline struct file *ll_dentry_open(struct dentry *dentry,
-                                         struct vfsmount *mnt, int flags,
-                                         const struct cred *cred)
-{
 #ifdef HAVE_DENTRY_OPEN_USE_PATH
-       struct path path = { .mnt = mnt, .dentry = dentry };
-       return dentry_open(&path, flags, cred);
-#elif defined HAVE_DENTRY_OPEN_4ARGS
-       return dentry_open(dentry, mnt, flags, cred);
+#define ll_dentry_open(a,b,c)  dentry_open(a,b,c)
 #else
-       return dentry_open(dentry, mnt, flags);
-#endif
+/*
+ * dentry_open handles its own reference counting since Linux v3.6
+ * (commit 765927b2). Callers should free their own references.
+ *
+ * Prior versions expected the caller to increment the references.
+ * The references are retained on success and freed on error.
+ */
+static inline struct file *ll_dentry_open(struct path *path, int flags,
+                                         const struct cred *cred)
+{
+       mntget(path->mnt);
+       dget(path->dentry);
+# ifdef HAVE_DENTRY_OPEN_4ARGS
+       return dentry_open(path->dentry, path->mnt, flags, cred);
+# else
+       return dentry_open(path->dentry, path->mnt, flags);
+# endif
 }
+#endif
 
 #ifdef HAVE_SECURITY_PLUG
 #define ll_vfs_symlink(dir, dentry, mnt, path, mode) \
@@ -168,6 +177,14 @@ static inline struct file *ll_dentry_open(struct dentry *dentry,
 
 #endif
 
+#if !defined(HAVE_FILE_LLSEEK_SIZE) || defined(HAVE_FILE_LLSEEK_SIZE_5ARGS)
+#define ll_generic_file_llseek_size(file, offset, origin, maxbytes, eof) \
+               generic_file_llseek_size(file, offset, origin, maxbytes, eof);
+#else
+#define ll_generic_file_llseek_size(file, offset, origin, maxbytes, eof) \
+               generic_file_llseek_size(file, offset, origin, maxbytes);
+#endif
+
 #ifdef HAVE_INODE_DIO_WAIT
 /* inode_dio_wait(i) use as-is for write lock */
 # define inode_dio_write_done(i)       do {} while (0) /* for write unlock */
@@ -538,6 +555,7 @@ static inline int ll_quota_off(struct super_block *sb, int off, int remount)
 #define blk_queue_logical_block_size(q, sz) blk_queue_hardsect_size(q, sz)
 #endif
 
+#ifndef HAVE_DQUOT_SUSPEND
 #ifndef HAVE_VFS_DQ_OFF
 # define ll_vfs_dq_init             DQUOT_INIT
 # define ll_vfs_dq_drop             DQUOT_DROP
@@ -549,19 +567,16 @@ static inline int ll_quota_off(struct super_block *sb, int off, int remount)
 # define ll_vfs_dq_transfer         vfs_dq_transfer
 # define ll_vfs_dq_off(sb, remount) vfs_dq_off(sb, remount)
 #endif
-
-#ifdef HAVE_BDI_INIT
-#define ll_bdi_init(bdi)    bdi_init(bdi)
-#define ll_bdi_destroy(bdi) bdi_destroy(bdi)
 #else
-#define ll_bdi_init(bdi)    0
-#define ll_bdi_destroy(bdi) do { } while(0)
+# define ll_vfs_dq_init             dquot_initialize
+# define ll_vfs_dq_drop             dquot_drop
+# define ll_vfs_dq_transfer         dquot_transfer
+# define ll_vfs_dq_off(sb, remount) dquot_suspend(sb, -1)
 #endif
 
-#ifdef HAVE_NEW_BACKING_DEV_INFO
-# define ll_bdi_wb_cnt(bdi) ((bdi).wb_cnt)
-#else
-# define ll_bdi_wb_cnt(bdi) 1
+#ifndef HAVE_BDI_INIT
+#define bdi_init(bdi)    0
+#define bdi_destroy(bdi) do { } while (0)
 #endif
 
 #ifdef HAVE_BLK_QUEUE_MAX_SECTORS /* removed in rhel6 */
@@ -626,15 +641,13 @@ static inline int ll_quota_off(struct super_block *sb, int off, int remount)
 #endif
 
 #ifdef HAVE_ADD_TO_PAGE_CACHE_LRU
-#define ll_add_to_page_cache_lru(pg, mapping, off, gfp) \
-        add_to_page_cache_lru(pg, mapping, off, gfp)
 #define ll_pagevec_init(pv, cold)       do {} while (0)
 #define ll_pagevec_add(pv, pg)          (0)
 #define ll_pagevec_lru_add_file(pv)     do {} while (0)
 #else
-#define ll_add_to_page_cache_lru(pg, mapping, off, gfp) \
+#define add_to_page_cache_lru(pg, mapping, off, gfp) \
         add_to_page_cache(pg, mapping, off, gfp)
-#define ll_pagevec_init(pv, cold)       pagevec_init(&lru_pvec, cold);
+#define ll_pagevec_init(pv, cold)       pagevec_init(pv, cold);
 #define ll_pagevec_add(pv, pg)                                 \
 ({                                                             \
        int __ret;                                              \
@@ -645,9 +658,12 @@ static inline int ll_quota_off(struct super_block *sb, int off, int remount)
 #define ll_pagevec_lru_add_file(pv)     pagevec_lru_add_file(pv)
 #endif
 
-#if !defined(HAVE_NODE_TO_CPUMASK) && defined(HAVE_CPUMASK_OF_NODE)
-#define node_to_cpumask(i)         (*(cpumask_of_node(i)))
-#define HAVE_NODE_TO_CPUMASK
+#if !defined(HAVE_CPUMASK_OF_NODE) && defined(HAVE_NODE_TO_CPUMASK)
+# ifdef HAVE_OFED_CPUMASK_OF_NODE
+# undef cpumask_of_node
+# define HAVE_CPUMASK_OF_NODE
+# endif
+#define cpumask_of_node(i)     (&node_to_cpumask(i))
 #endif
 
 #ifndef QUOTA_OK