From 0f0dcb57807c8741e3a1e98bdf9b3b349a2499b6 Mon Sep 17 00:00:00 2001 From: Cong Wang Date: Fri, 25 Nov 2011 23:14:29 +0800 Subject: [PATCH] --- yaml --- r: 291807 b: refs/heads/master c: bf7014b67fd931003e5f12e6742b1fc5f6c0a045 h: refs/heads/master i: 291805: a882ccf78eb07d70627d0576221dbf68763880ed 291803: 8d1868a0fe47792e9d389254b3b54418552c037b 291799: c88fabe686a6c268aa5de1d2d239e4df8dab7d16 291791: 337bc242f72f861a5dfa90595e482276e8011e7a 291775: fb09de93f08be12e953bbcffd82a296fb82b7e90 v: v3 --- [refs] | 2 +- trunk/fs/exofs/dir.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 7377fdd4431f..98594c61a293 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: da4aa36d0140ca8ef1e67df3e829b9085d369dca +refs/heads/master: bf7014b67fd931003e5f12e6742b1fc5f6c0a045 diff --git a/trunk/fs/exofs/dir.c b/trunk/fs/exofs/dir.c index 80405836ba6e..c61e62ac231c 100644 --- a/trunk/fs/exofs/dir.c +++ b/trunk/fs/exofs/dir.c @@ -597,7 +597,7 @@ int exofs_make_empty(struct inode *inode, struct inode *parent) goto fail; } - kaddr = kmap_atomic(page, KM_USER0); + kaddr = kmap_atomic(page); de = (struct exofs_dir_entry *)kaddr; de->name_len = 1; de->rec_len = cpu_to_le16(EXOFS_DIR_REC_LEN(1)); @@ -611,7 +611,7 @@ int exofs_make_empty(struct inode *inode, struct inode *parent) de->inode_no = cpu_to_le64(parent->i_ino); memcpy(de->name, PARENT_DIR, sizeof(PARENT_DIR)); exofs_set_de_type(de, inode); - kunmap_atomic(kaddr, KM_USER0); + kunmap_atomic(kaddr); err = exofs_commit_chunk(page, 0, chunk_size); fail: page_cache_release(page);