* Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
* Use is subject to license terms.
*
- * Copyright (c) 2011, 2012, Whamcloud, Inc.
+ * Copyright (c) 2011, 2012, Intel Corporation.
*/
/*
* This file is part of Lustre, http://www.lustre.org/
#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) \
#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 */
# define inode_dio_done(i) up_read(&(i)->i_alloc_sem)
#endif
-#ifdef HAVE_HIDE_VFSMOUNT_GUTS
-# include <../fs/mount.h>
-#else
-# define real_mount(mnt) (mnt)
-#endif
-
-static inline const char *mnt_get_devname(struct vfsmount *mnt)
-{
- return real_mount(mnt)->mnt_devname;
-}
-
-#ifndef HAVE_ATOMIC_MNT_COUNT
-static inline unsigned int mnt_get_count(struct vfsmount *mnt)
-{
-#ifdef CONFIG_SMP
- unsigned int count = 0;
- int cpu;
-
- for_each_possible_cpu(cpu) {
- count += per_cpu_ptr(real_mount(mnt)->mnt_pcp, cpu)->mnt_count;
- }
-
- return count;
-#else
- return real_mount(mnt)->mnt_count;
-#endif
-}
-#else
-# define mnt_get_count(mnt) cfs_atomic_read(&(real_mount(mnt)->mnt_count))
-#endif
-
#ifdef HAVE_RW_TREE_LOCK
#define TREE_READ_LOCK_IRQ(mapping) read_lock_irq(&(mapping)->tree_lock)
#define TREE_READ_UNLOCK_IRQ(mapping) read_unlock_irq(&(mapping)->tree_lock)
#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
# 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 */
#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; \
#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
git://git.whamcloud.com / fs / lustre-release.git / blobdiff