diff options
| author | Anton Habegger <anton.habegger@gmail.com> | 2015-01-22 22:29:10 +0100 |
|---|---|---|
| committer | Heiko Schocher <hs@denx.de> | 2015-01-28 07:42:35 +0100 |
| commit | dc2884315d492b1eefd9d32443c1f0aa3c0a991e (patch) | |
| tree | 91247ed75616bc3e530ab1866786e5a66b748dae /fs/ubifs | |
| parent | 40da2a2a08f12015d06d78a334e4d977963fee34 (diff) | |
| download | talos-obmc-uboot-dc2884315d492b1eefd9d32443c1f0aa3c0a991e.tar.gz talos-obmc-uboot-dc2884315d492b1eefd9d32443c1f0aa3c0a991e.zip | |
ubifs: Import atomic_long operations from Linux
This commit is a preperation for a subsequent UBIFS commit
which needs atomic_long operations.
Therefor "include/asm-generic/atomic-long.h" is imported
from 1860e37 Linux 3.15
Signed-off-by: Anton Habegger <anton.habegger@gmail.com>
Diffstat (limited to 'fs/ubifs')
| -rw-r--r-- | fs/ubifs/ubifs.c | 6 | ||||
| -rw-r--r-- | fs/ubifs/ubifs.h | 12 |
2 files changed, 8 insertions, 10 deletions
diff --git a/fs/ubifs/ubifs.c b/fs/ubifs/ubifs.c index 49e6f469ca..6dd617426a 100644 --- a/fs/ubifs/ubifs.c +++ b/fs/ubifs/ubifs.c @@ -150,6 +150,12 @@ static inline int crypto_comp_decompress(struct crypto_comp *tfm, return 0; } + +/* from shrinker.c */ + +/* Global clean znode counter (for all mounted UBIFS instances) */ +atomic_long_t ubifs_clean_zn_cnt; + #endif /** diff --git a/fs/ubifs/ubifs.h b/fs/ubifs/ubifs.h index c12026147f..a51b2376d2 100644 --- a/fs/ubifs/ubifs.h +++ b/fs/ubifs/ubifs.h @@ -31,6 +31,8 @@ #include <linux/backing-dev.h> #include "ubifs-media.h" #else +#include <asm/atomic.h> +#include <asm-generic/atomic-long.h> #include <ubi_uboot.h> #include <linux/ctype.h> @@ -63,16 +65,6 @@ struct page { void iput(struct inode *inode); -/* - * The atomic operations are used for budgeting etc which is not - * needed for the read-only U-Boot implementation: - */ -#define atomic_long_inc(a) -#define atomic_long_dec(a) -#define atomic_long_sub(a, b) - -typedef unsigned long atomic_long_t; - /* linux/include/time.h */ #define NSEC_PER_SEC 1000000000L #define get_seconds() 0 |
