aboutsummaryrefslogtreecommitdiffstats
path: root/fs/jfs
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2014-12-10 19:10:49 -0500
committerLinus Torvalds <torvalds@linux-foundation.org>2014-12-10 19:10:49 -0500
commitcbfe0de303a55ed96d8831c2d5f56f8131cd6612 (patch)
treeb327762303c6a015421e4077e7c713b8a47a5e0e /fs/jfs
parent8322b6fddfd2cee41a7732284e5f04750511f4b2 (diff)
parentba00410b8131b23edfb0e09f8b6dd26c8eb621fb (diff)
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
Pull VFS changes from Al Viro: "First pile out of several (there _definitely_ will be more). Stuff in this one: - unification of d_splice_alias()/d_materialize_unique() - iov_iter rewrite - killing a bunch of ->f_path.dentry users (and f_dentry macro). Getting that completed will make life much simpler for unionmount/overlayfs, since then we'll be able to limit the places sensitive to file _dentry_ to reasonably few. Which allows to have file_inode(file) pointing to inode in a covered layer, with dentry pointing to (negative) dentry in union one. Still not complete, but much closer now. - crapectomy in lustre (dead code removal, mostly) - "let's make seq_printf return nothing" preparations - assorted cleanups and fixes There _definitely_ will be more piles" * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs: (63 commits) copy_from_iter_nocache() new helper: iov_iter_kvec() csum_and_copy_..._iter() iov_iter.c: handle ITER_KVEC directly iov_iter.c: convert copy_to_iter() to iterate_and_advance iov_iter.c: convert copy_from_iter() to iterate_and_advance iov_iter.c: get rid of bvec_copy_page_{to,from}_iter() iov_iter.c: convert iov_iter_zero() to iterate_and_advance iov_iter.c: convert iov_iter_get_pages_alloc() to iterate_all_kinds iov_iter.c: convert iov_iter_get_pages() to iterate_all_kinds iov_iter.c: convert iov_iter_npages() to iterate_all_kinds iov_iter.c: iterate_and_advance iov_iter.c: macros for iterating over iov_iter kill f_dentry macro dcache: fix kmemcheck warning in switch_names new helper: audit_file() nfsd_vfs_write(): use file_inode() ncpfs: use file_inode() kill f_dentry uses lockd: get rid of ->f_path.dentry->d_sb ...
Diffstat (limited to 'fs/jfs')
-rw-r--r--fs/jfs/namei.c18
1 files changed, 8 insertions, 10 deletions
diff --git a/fs/jfs/namei.c b/fs/jfs/namei.c
index d59c7defb1ef..38fdc533f4ec 100644
--- a/fs/jfs/namei.c
+++ b/fs/jfs/namei.c
@@ -84,7 +84,7 @@ static int jfs_create(struct inode *dip, struct dentry *dentry, umode_t mode,
84 struct inode *iplist[2]; 84 struct inode *iplist[2];
85 struct tblock *tblk; 85 struct tblock *tblk;
86 86
87 jfs_info("jfs_create: dip:0x%p name:%s", dip, dentry->d_name.name); 87 jfs_info("jfs_create: dip:0x%p name:%pd", dip, dentry);
88 88
89 dquot_initialize(dip); 89 dquot_initialize(dip);
90 90
@@ -216,7 +216,7 @@ static int jfs_mkdir(struct inode *dip, struct dentry *dentry, umode_t mode)
216 struct inode *iplist[2]; 216 struct inode *iplist[2];
217 struct tblock *tblk; 217 struct tblock *tblk;
218 218
219 jfs_info("jfs_mkdir: dip:0x%p name:%s", dip, dentry->d_name.name); 219 jfs_info("jfs_mkdir: dip:0x%p name:%pd", dip, dentry);
220 220
221 dquot_initialize(dip); 221 dquot_initialize(dip);
222 222
@@ -352,7 +352,7 @@ static int jfs_rmdir(struct inode *dip, struct dentry *dentry)
352 struct inode *iplist[2]; 352 struct inode *iplist[2];
353 struct tblock *tblk; 353 struct tblock *tblk;
354 354
355 jfs_info("jfs_rmdir: dip:0x%p name:%s", dip, dentry->d_name.name); 355 jfs_info("jfs_rmdir: dip:0x%p name:%pd", dip, dentry);
356 356
357 /* Init inode for quota operations. */ 357 /* Init inode for quota operations. */
358 dquot_initialize(dip); 358 dquot_initialize(dip);
@@ -480,7 +480,7 @@ static int jfs_unlink(struct inode *dip, struct dentry *dentry)
480 s64 new_size = 0; 480 s64 new_size = 0;
481 int commit_flag; 481 int commit_flag;
482 482
483 jfs_info("jfs_unlink: dip:0x%p name:%s", dip, dentry->d_name.name); 483 jfs_info("jfs_unlink: dip:0x%p name:%pd", dip, dentry);
484 484
485 /* Init inode for quota operations. */ 485 /* Init inode for quota operations. */
486 dquot_initialize(dip); 486 dquot_initialize(dip);
@@ -797,8 +797,7 @@ static int jfs_link(struct dentry *old_dentry,
797 struct btstack btstack; 797 struct btstack btstack;
798 struct inode *iplist[2]; 798 struct inode *iplist[2];
799 799
800 jfs_info("jfs_link: %s %s", old_dentry->d_name.name, 800 jfs_info("jfs_link: %pd %pd", old_dentry, dentry);
801 dentry->d_name.name);
802 801
803 dquot_initialize(dir); 802 dquot_initialize(dir);
804 803
@@ -1082,8 +1081,7 @@ static int jfs_rename(struct inode *old_dir, struct dentry *old_dentry,
1082 int commit_flag; 1081 int commit_flag;
1083 1082
1084 1083
1085 jfs_info("jfs_rename: %s %s", old_dentry->d_name.name, 1084 jfs_info("jfs_rename: %pd %pd", old_dentry, new_dentry);
1086 new_dentry->d_name.name);
1087 1085
1088 dquot_initialize(old_dir); 1086 dquot_initialize(old_dir);
1089 dquot_initialize(new_dir); 1087 dquot_initialize(new_dir);
@@ -1355,7 +1353,7 @@ static int jfs_mknod(struct inode *dir, struct dentry *dentry,
1355 if (!new_valid_dev(rdev)) 1353 if (!new_valid_dev(rdev))
1356 return -EINVAL; 1354 return -EINVAL;
1357 1355
1358 jfs_info("jfs_mknod: %s", dentry->d_name.name); 1356 jfs_info("jfs_mknod: %pd", dentry);
1359 1357
1360 dquot_initialize(dir); 1358 dquot_initialize(dir);
1361 1359
@@ -1444,7 +1442,7 @@ static struct dentry *jfs_lookup(struct inode *dip, struct dentry *dentry, unsig
1444 struct component_name key; 1442 struct component_name key;
1445 int rc; 1443 int rc;
1446 1444
1447 jfs_info("jfs_lookup: name = %s", dentry->d_name.name); 1445 jfs_info("jfs_lookup: name = %pd", dentry);
1448 1446
1449 if ((rc = get_UCSname(&key, dentry))) 1447 if ((rc = get_UCSname(&key, dentry)))
1450 return ERR_PTR(rc); 1448 return ERR_PTR(rc);