summary refs log tree commit diff
path: root/drivers
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-12-22 14:20:48 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2009-12-22 14:20:48 -0800
commitfe35d4a0289a8d6efcacb57e9a377b845686df10 (patch)
tree05ff26e6658d3ddc6e4885059bbf018b1681bb3b /drivers
parent9917f7bbe96432012d3ad8075e9fd99390255d0c (diff)
parent28ba0ec64ca0f6ad2b0338ccec0b00a4e64e7a69 (diff)
downloadlinux-fe35d4a0289a8d6efcacb57e9a377b845686df10.tar.gz
Merge git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6:
  jfs: Fix 32bit build warning
  Remove obsolete comment in fs.h
  Sanitize f_flags helpers
  Fix f_flags/f_mode in case of lookup_instantiate_filp() from open(pathname, 3)
  anonfd: Allow making anon files read-only
  fs/compat_ioctl.c: fix build error when !BLOCK
  pohmelfs needs I_LOCK
  alloc_file(): simplify handling of mnt_clone_write() errors
Diffstat (limited to 'drivers')
-rw-r--r--drivers/staging/pohmelfs/dir.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/staging/pohmelfs/dir.c b/drivers/staging/pohmelfs/dir.c
index 6c5b261e9f06..aacd25bfb0cb 100644
--- a/drivers/staging/pohmelfs/dir.c
+++ b/drivers/staging/pohmelfs/dir.c
@@ -722,8 +722,6 @@ static int pohmelfs_remove_entry(struct inode *dir, struct dentry *dentry)
 		if (inode->i_nlink)
 			inode_dec_link_count(inode);
 	}
-	dprintk("%s: inode: %p, lock: %ld, unhashed: %d.\n",
-		__func__, pi, inode->i_state & I_LOCK, hlist_unhashed(&inode->i_hash));
 
 	return err;
 }