Merge git://git.infradead.org/mtd-2.6

* git://git.infradead.org/mtd-2.6:
  [MTD][NOR] Add physical address to point() method
  [JFFS2] Track parent inode for directories (for NFS export)
  [JFFS2] Invert last argument of jffs2_gc_fetch_inode(), make it boolean.
  [JFFS2] Quiet lockdep false positive.
  [JFFS2] Clean up jffs2_alloc_inode() and jffs2_i_init_once()
  [MTD] Delete long-unused jedec.h header file.
  [MTD] [NAND] at91_nand: use at91_nand_{en,dis}able consistently.

diff --combined fs/jffs2/xattr.c
index 574cb7532d6c13e8b0fa6b3e1ccc1638ebfc4201,05531f291bfa6a5320e798f735aab4c7af5cd709..082e844ab2db1fa11ce5a86453f5bdce957df7b2
--- 1/fs/jffs2/xattr.c
--- 2/fs/jffs2/xattr.c
+++ b/fs/jffs2/xattr.c
@@@ -82,7 -82,7 +82,7 @@@ static int is_xattr_datum_unchecked(str
  static void unload_xattr_datum(struct jffs2_sb_info *c, struct jffs2_xattr_datum *xd)
  {
        /* must be called under down_write(xattr_sem) */
 -      D1(dbg_xattr("%s: xid=%u, version=%u\n", __FUNCTION__, xd->xid, xd->version));
 +      D1(dbg_xattr("%s: xid=%u, version=%u\n", __func__, xd->xid, xd->version));
        if (xd->xname) {
                c->xdatum_mem_usage -= (xd->name_len + 1 + xd->value_len);
                kfree(xd->xname);
@@@ -592,7 -592,7 +592,7 @@@ void jffs2_xattr_delete_inode(struct jf
           When an inode with XATTR is removed, those XATTRs must be removed. */
        struct jffs2_xattr_ref *ref, *_ref;
  
-       if (!ic || ic->nlink > 0)
+       if (!ic || ic->pino_nlink > 0)
                return;
  
        down_write(&c->xattr_sem);
@@@ -829,7 -829,7 +829,7 @@@ void jffs2_build_xattr_subsystem(struc
                           ref->xd and ref->ic are not valid yet. */
                        xd = jffs2_find_xattr_datum(c, ref->xid);
                        ic = jffs2_get_ino_cache(c, ref->ino);
-                       if (!xd || !ic || !ic->nlink) {
+                       if (!xd || !ic || !ic->pino_nlink) {
                                dbg_xattr("xref(ino=%u, xid=%u, xseqno=%u) is orphan.\n",
                                          ref->ino, ref->xid, ref->xseqno);
                                ref->xseqno |= XREF_DELETE_MARKER;
@@@ -1252,7 -1252,7 +1252,7 @@@ int jffs2_garbage_collect_xattr_ref(str
        rc = jffs2_reserve_space_gc(c, totlen, &length, JFFS2_SUMMARY_XREF_SIZE);
        if (rc) {
                JFFS2_WARNING("%s: jffs2_reserve_space_gc() = %d, request = %u\n",
 -                            __FUNCTION__, rc, totlen);
 +                            __func__, rc, totlen);
                rc = rc ? rc : -EBADFD;
                goto out;
        }